diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 19:11:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-29 19:11:37 +0000 |
| commit | f3000d2cc17e90c707ab6c098ac49210812bdfcc (patch) | |
| tree | 70003cff836496bf1001e1ea8ef3a6cd3544a705 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6814e1a3e14f86c924aa5c084ee0524de3fa597c (diff) | |
| parent | fd9ba59c62c0f1d94cf2c015620b7beb55583eb9 (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
automerge: fd9ba59 -s ours
* commit 'fd9ba59c62c0f1d94cf2c015620b7beb55583eb9':
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