tree a9c9e66083e9a8f4f2d0e2ad33bdfe092d3d1e15
parent 83df2470548aa270162fbaec43556ba1cc1eae05
parent 39c5cdf8fbdf7d56aa6166368b4da27d704018d0
author Yifan Hong <elsk@google.com> 1481688187 +0000
committer android-build-merger <android-build-merger@google.com> 1481688187 +0000

Merge "Update makefiles for Java package path." am: 698b6a9614 am: 1f8c3cd2f2
am: 39c5cdf8fb

Change-Id: I71585786f688acc458c11f51b1182eebcaf93cb7