diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-10-20 02:21:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-20 02:21:16 +0000 |
| commit | c10c5725308bbe9e97d0fa2bb3e1a6c817385140 (patch) | |
| tree | e95c1969c43a27c0ade6b6814e84db265c6e8805 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | a63880c929a5ac7a64f4ba0e44cc9d72a360b490 (diff) | |
| parent | 340a5c94df6a1303eccfac05d06ffe8a1b699ced (diff) | |
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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions