diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 18:09:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 18:09:27 +0000 |
| commit | 336fc1fff793b2e5272f0b37cefe9ccf5dba5a53 (patch) | |
| tree | b14af1eeebaff0c79f47d8d8089f1e3e5b2c4edd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8b1ad8e4d148b70e31d675515e8ad24ca3d12169 (diff) | |
| parent | 7ab0ac6927538ad3e7d09adc3524b88bfad75abc (diff) | |
am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '7ab0ac6927538ad3e7d09adc3524b88bfad75abc':
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