tree 627523579d4204d8cb16422c6c094d1d915fb024
parent 24678e9469d0f184bf80f51ed0044a3be0489245
parent 40098dca314acb1ba988314517c129bee6db8b8e
author Treehugger Robot <treehugger-gerrit@google.com> 1502842505 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1502842505 +0000

Merge "Updated static_java_library.mk to support proguard options."