diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-10-11 21:04:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 21:04:06 +0000 |
| commit | e6f60d0fcb551e28bfefc9ed46e8e938df43ce1f (patch) | |
| tree | 63eaccec4416fe28ee42d3659c9f65f4ed93d09c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 311fa22ecb120df7f844864ff0b1265892a78f3d (diff) | |
| parent | 98371ee7c9b5175cad2e0b7060cc5983bcb828d7 (diff) | |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9
am: 98371ee7c9
Change-Id: I02c6f8314289abbc0639c634c478f293ecd1d679
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions