tree a9c9e66083e9a8f4f2d0e2ad33bdfe092d3d1e15
parent e668d6f6b5db76f670794cb1ac6284190558f482
parent 1f8c3cd2f2ae35635a95363976fe30dc456af1d2
author Yifan Hong <elsk@google.com> 1481687738 +0000
committer android-build-merger <android-build-merger@google.com> 1481687738 +0000

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

Change-Id: Id21817bcae944e930ef094d683fecc83cf6e6098