diff options
author | Sebastien Hertz <shertz@google.com> | 2015-08-21 10:21:28 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 10:21:28 +0000 |
commit | 534553579228d7802b410b4cec41b8c0f4fd9079 (patch) | |
tree | a9acf177e7cce9ddc2001c3122187ea21f47dfc2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 905cb17f921a804fde3679a2f8887055ec7db028 (diff) | |
parent | b56c6437c5edd58bfa6f7e101d22e778adae3c15 (diff) |
am b56c6437: am b1d01411: am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev
* commit 'b56c6437c5edd58bfa6f7e101d22e778adae3c15':
Allow debugging only for apps forked from zygote
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions