diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-10-11 22:15:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 22:15:44 +0000 |
| commit | e8af749eece0521db3d4b7465bbca4169b4a9deb (patch) | |
| tree | 3316ef90ac83437e0d0aaf1e831cb8ff40b273cb /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 3700554d86d895b32ad38ccfb9b2918c0e85534b (diff) | |
| parent | c4649e252dca4dc234ccd5087f5a41865b96d7d0 (diff) | |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194 am: 8bfef31ce0
am: c4649e252d -s ours
Change-Id: I874d8afcbd14d28bf7ade224fc7cb72093482e1d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions