diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-10-20 03:30:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-20 03:30:07 +0000 |
| commit | 893c83a2b8654e5c4ba58df1d22651f8e5367c36 (patch) | |
| tree | a6aa497b40761c84ef193b301421fef70159e444 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | f2a88db473b6a1ab4f2140879c04a46b569fcc57 (diff) | |
| parent | 159a48909319d7e866ace2a2c7bbc058751b49ac (diff) | |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693 am: 3bb6994a0b -s ours am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb am: 76d9732106 am: af70ac2914 -s ours am: 571c8a4507 am: 45829c0c41 am: 9117ad721a am: 0f4e6c4736 -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions