diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:28:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-09 23:28:25 +0000 |
| commit | e790e725b127a51e5fa9c4a68336729733d8b95b (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 62714132517eebae4582335a5b3318f8708acce5 (diff) | |
| parent | d4759678549a1d70a399a0ec858d7535036e419c (diff) | |
Merge changes from topic "am-fcaf83c4f43a4eb0ae1c08dcf7fa50d3"
* 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: e92d1f42a2 -s ours am: 8432837b83 -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: 47ef843861 -s ours am: 0815e743a8 -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions