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