diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-02 15:56:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-02 15:56:26 +0000 |
| commit | 205e11f7939f3f0e04fbcb054f8ac021adfa911b (patch) | |
| tree | 126912f4882e9488d6abe54afbaa48abbb7e0cb0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0979fa6cf1657dd6b13dd292ff27d30ea29e8eac (diff) | |
| parent | 693bcf5a2ec876b8ac08b7153551540fd70ff032 (diff) | |
Merge changes from topic "am-39b53b3019ba4dd38e8861a245803c35" into rvc-d1-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."" into rvc-dev am: 3d61c82b41 am: a88ba4ea3c
[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6." am: a2127eb446 am: bf5989c341
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions