diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-10-20 03:23:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-20 03:23:20 +0000 |
| commit | 2a5fc8fb93b2d42aaf86bbaebe17c68ce73268bf (patch) | |
| tree | a6aa497b40761c84ef193b301421fef70159e444 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c0868792a2c0807b0ef4b821e7a8b8090d6ce413 (diff) | |
| parent | d81a48c7844601cb2031944143d49209bcf6f7b9 (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: c13982c8a8 am: a63880c929 -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions