tree 415cf1c4c1eb3e3005f5d725692eded55fb8d9b1
parent b64e777f6c14d862f221f4da814079df22663db1
parent 96ea5ccef6c3db4178005a52c4e619f6f5368303
author Nicolas Geoffray <ngeoffray@google.com> 1485790345 +0000
committer android-build-merger <android-build-merger@google.com> 1485790345 +0000

Merge "Introduce DEBUG_JAVA_DEBUGGABLE." am: 4df43ad959 am: 27ffe754a4 am: 1852c380e0
am: 96ea5ccef6

Change-Id: I4f8ba4240106ea84c29b6ae11dfc007af7048eb1