tree a4f0aae330e914840404e5ce9d38669a96dfe3f6
parent 7adb3487967a0dbee54fe74f450a364fbbc6a17f
parent 27ffe754a4c0a3f64676635a29c37af14734cde3
author Nicolas Geoffray <ngeoffray@google.com> 1485789677 +0000
committer android-build-merger <android-build-merger@google.com> 1485789677 +0000

Merge "Introduce DEBUG_JAVA_DEBUGGABLE." am: 4df43ad959
am: 27ffe754a4

Change-Id: I24d3eed3d6172fdff79a74945ecadea7b0d76590