diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 20:32:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-03 20:32:01 +0000 |
| commit | 2bc862f764db76202f3118e7978637b374a01973 (patch) | |
| tree | 91f080327b98577f81c78b734eaf0b196f6cc624 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | da72ee3c05923d632e84df7de332bbe5c829905f (diff) | |
| parent | eea05c4c425c852d90beb31069faf03cd6d81fd4 (diff) | |
Merge changes from topic "am-9913fa96337e4f3cb79ffb32d3a1656e" into rvc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into oc-dev am: c842acc15a am: 65d650efa4 am: fab2a65c3a -s ours am: bbe2cb562e -s ours am: 3d040f13ca am: 8c06aa9193 -s ours am: be73cb8c46 am: f0eb301c60
[automerger skipped] DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package am: fc8bfed553 am: 0ce3ba0c26 am: 6bb732c781 -s ours am: e957e80fe1 -s ours am: bdd6f152d0 am: a299d6336d -s ours am: 9f3d9cd5a7 am: 24c833854e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions