diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-10-11 23:54:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-11 23:54:39 +0000 |
| commit | 1bfc9ff526eaca4f7a601d92c56939061e83a72d (patch) | |
| tree | dc131ef5462f0f480eb035a08312900336cc762c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 609a6cf129db26c89454e6d611478ea774e7159c (diff) | |
| parent | 850e668a03833e501145e5bc16f2627c0a5accca (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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions