diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 19:29:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-03 19:29:24 +0000 |
| commit | bcf0775b171d8d0fe201609a489786e41a22cd8e (patch) | |
| tree | 3a079858e63391522d24443e7a64a73320de608f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 677ac0e476f143e799d280a5817d7c26736b4aff (diff) | |
| parent | 54f57240dbf1b0fcac199f877e20f12b7ecbf028 (diff) | |
Merge changes from topic "am-57d54eba49bd4bd898282201c28befa4" into rvc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package" into qt-dev am: 60928e84a6 am: 4f06896f31 -s ours am: f4374556b8 am: 3df3e10a8b
[automerger skipped] DO NOT MERGE: Verify INSTALL_PACKAGES permissions when adding installer package am: 75f6732236 am: 65108bae5f -s ours am: 61d46a1fea am: cfbf8729c3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions