diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-01-29 19:38:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 19:38:48 +0000 |
| commit | 64bdf77d9515f587f31998b614e524c26b2415a4 (patch) | |
| tree | a0983d173f2c97b8bb4430ba10e756f3ecd0382e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8b8d61952a4599439f3308a5f73bb0a2a0610563 (diff) | |
| parent | 8bb65246f2655fae8d807db973c5eaeff78733cc (diff) | |
am 8bb65246: 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: 48dad94 -s ours automerge: 6fe42f0 -s ours
* commit '8bb65246f2655fae8d807db973c5eaeff78733cc':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions