diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 19:04:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 19:04:37 +0000 |
| commit | ee7e1479f59aeb41aa54ae7e88dd5adb4f454615 (patch) | |
| tree | 7da41e730feea3fd3b2803c01ab321f2170ba189 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3308ad42fa162fbdda26337f64e00603b1388ec7 (diff) | |
| parent | 51ea897fca66c4042563a89f4593b9fd41f01b9d (diff) | |
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 '51ea897fca66c4042563a89f4593b9fd41f01b9d':
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