tree c6ccb9ee5fd0720b7c03935b174c9b2fba47df8b
parent 8d091da86af21517ba71fa84daef78bc11a5cb23
parent f93151b1c0a41109fc17b8afe8010dd43d7bb53a
author Steven Moreland <smoreland@google.com> 1507739472 +0000
committer android-build-merger <android-build-merger@google.com> 1507739472 +0000

Merge "Update makefiles for Android.bp Java." am: 514cf29060 am: 7066e00a16
am: f93151b1c0

Change-Id: I7709f22fca7e1f0966fe3548778a0506240690de