diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-10-11 20:30:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 20:30:25 +0000 |
| commit | 5f17a285f9b64dfb04f786b23902cab2a2bbd1a5 (patch) | |
| tree | 18d74257ed8caa2a76f26d32e0b5ceacc7984b5c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | e721fbddb51f4786d76072e56cf5a71a48584458 (diff) | |
| parent | 09984216e6ac885f1d5cff8d67ae152bd825de6c (diff) | |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
am: 09984216e6 -s ours
Change-Id: I3dcf7d6fdf11a8ed82d6f2362a18b12afaff1120
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions