diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 18:48:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 18:48:55 +0000 |
| commit | 8866ada112e877385b8aa2006bdedcf2e9e5e7df (patch) | |
| tree | 70003cff836496bf1001e1ea8ef3a6cd3544a705 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a29b65a37b5f9c245752bddd4b148e5d8529c4e9 (diff) | |
| parent | 143ac135dcf85b899ae387be2f13401ecd43f08b (diff) | |
am 143ac135: (-s ours) am 7a7d3a0e: am f9c96522: 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 '143ac135dcf85b899ae387be2f13401ecd43f08b':
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