Merge "Updated static_java_library.mk to support proguard options." am: 14e5c5975c -s ours

am: fbc9ffd072  -s ours

Change-Id: I4af4bb010e43df4b72b6cd8de9e33bf6602db8ef
This commit is contained in:
Jason Tholstrup 2017-08-16 00:40:10 +00:00 committed by android-build-merger
commit 3faefab6d9

Diff content is not available