diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:38:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-09 23:38:53 +0000 |
| commit | 3134d7bc86e44b5d5b4d258ba96b8543ab879167 (patch) | |
| tree | 884167f03987e592389fcce8669d06b82d9479d1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ffffe00d375c628ced8cc5aa50080776d0c907fc (diff) | |
| parent | 70461406061556eb53f6ebd23ccb82cc50170f4d (diff) | |
Merge changes from topic "am-172fa15a4900438f87529bf46598ea73" into rvc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge changes from topic "12940341" into oc-dev am: a9a03ae669 am: b172aaf747 am: 37beb3172b -s ours am: 5ea00f8c6c -s ours am: b77727b905 -s ours am: f2bc09c705 -s ours am: 5a72f60cd9 -s ours am: 28c0f6e07d -s ours am: 77e8fab136 -s ours
[automerger skipped] Ensure permissions are revoked on state changes am: 3dfb544626 am: ebfe073540 am: b2152f32f4 -s ours am: ff63084c2d -s ours am: fb70a5eaa7 -s ours am: 59511934e3 -s ours am: 27221c0b52 -s ours am: 0766b2c8ec -s ours am: 1d0c7ac581 -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions