diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-10-12 01:44:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-12 01:44:39 +0000 |
| commit | c06c27c5f6103e8e6106c2d1b198046e6e00a3ba (patch) | |
| tree | 4b212f635d9c61f706b2f681938b39d66ef59f38 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4ff7290d780f9ec61dffca962d0e188f44b40f86 (diff) | |
| parent | 1bfc9ff526eaca4f7a601d92c56939061e83a72d (diff) | |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 am: 753a9ab308 am: 065dc70c5a" into oc-mr1-dev-plus-aosp
am: 1bfc9ff526 -s ours
Change-Id: Ibb00ad9497ee1e07bba6085253257cde28e38b7b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions