diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-10-20 03:26:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-20 03:26:46 +0000 |
| commit | f2a88db473b6a1ab4f2140879c04a46b569fcc57 (patch) | |
| tree | a6aa497b40761c84ef193b301421fef70159e444 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 2a5fc8fb93b2d42aaf86bbaebe17c68ce73268bf (diff) | |
| parent | 8e9fb175b2aa1e0a2a3df7c6e46a73a17c70ffb0 (diff) | |
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492 -s ours am: 7f00f14d81 am: 3c30346de2 am: b049f43f9b am: 1b40397eb0 am: 00183554a9 -s ours am: 61d6dd8185 am: 438ed4369d am: d59cb81ea9" into oc-mr1-dev-plus-aosp am: c10c572530 -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions