diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 19:09:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 19:09:00 +0000 |
| commit | fd9ba59c62c0f1d94cf2c015620b7beb55583eb9 (patch) | |
| tree | a0c3ff70b6a365bc911f442c8d867a80892a7ac2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1b5705386aed3135526ffe7c3f7b460ad944bcb3 (diff) | |
| parent | ee7e1479f59aeb41aa54ae7e88dd5adb4f454615 (diff) | |
am ee7e1479: am 51ea897f: am 470f3a98: am 0a63d817: am 48dad949: (-s ours) am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit 'ee7e1479f59aeb41aa54ae7e88dd5adb4f454615':
DO NOT MERGE Restore calling identity before checking permission
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions