diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-10-11 21:32:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 21:32:36 +0000 |
| commit | b49d3579150051a33b858422abe961dbd8377486 (patch) | |
| tree | 3d24677b9c7aadc33206f0a11e18831715aab168 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4a69ee914c83b0bebe0c3a6d62f4abcb85328b32 (diff) | |
| parent | e0e1c8ae4c81e54e2294c76975bde45fcfe89274 (diff) | |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9
am: e0e1c8ae4c
Change-Id: I4ace250ae2b4998e7c77f361dddd47f815b9ad27
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions