diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 18:24:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 18:24:20 +0000 |
| commit | f9c9652256921eeb70484757f375aaa252f9c574 (patch) | |
| tree | 006ae6ee2e87de03bf7a2145fa94add644bca76d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8514766a0a388c3598eaa64709edc634f8edccb1 (diff) | |
| parent | 6959a94f372d54e63f53b8cfc98b57ce4ab0866b (diff) | |
am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '6959a94f372d54e63f53b8cfc98b57ce4ab0866b':
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