tree 158aeaf8fba66867df1187c755811c70c138e21a
parent 7c6e1db633b358ce6c9d2cc31432a5b357988069
parent 0f584697bce7987ba3cbb6cf598d9b8cde977449
author Steven Moreland <smoreland@google.com> 1501876904 +0000
committer android-build-merger <android-build-merger@google.com> 1501876904 +0000

Merge "Update makefiles to remove java-static libs." am: f1bef4107d am: e6cbd2db20 am: dffa8dcd87
am: 0f584697bc

Change-Id: Id1e57506c6b11a195eae72b6c58bd50e9884fb0e