diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 19:22:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-03 19:22:57 +0000 |
| commit | db42301cf896f38cd731d4e83989f65e7d7f5bce (patch) | |
| tree | c3c126111da5bf9bfb1428d9ef9039b7d9818043 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | be3ff32dd24993fff45256575268a00faf16b71c (diff) | |
| parent | 6d36b2e3d8377b707d7c778bca6da115e4e88f53 (diff) | |
Merge changes from topic "am-9249891b1e3043ff890e9507ac662fd1" into rvc-qpr-dev-plus-aosp
* changes:
Merge "[automerger skipped] Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into qt-qpr1-dev am: fd3f872d33 -s ours am: 0cb1ec4c4e am: 2f37ffea70" into rvc-d1-dev-plus-aosp am: 584a331b3f
[automerger skipped] Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into qt-qpr1-dev am: fd3f872d33 -s ours am: 0cb1ec4c4e am: 2f37ffea70 am: e22010c113
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions