diff options
| author | Matt Pietal <mpietal@google.com> | 2021-12-09 14:33:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-09 14:33:09 +0000 |
| commit | aebceb03257368cc7af82f94b3afa49ef016cf06 (patch) | |
| tree | 8ad6b081ffffd813c313c6237a175164e8d03fbb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ce700e9f8d827a250c0c7eb1402d9abe1c4cf4fa (diff) | |
| parent | 9c6fc1d31da869649f019c5505e18b6772cb2e38 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Controls - Do not recreate intent" into rvc-dev am: 2cc3ce9885 am: 920d225e72 -s ours am: 151e1ff45e -s ours am: 9c6fc1d31d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16012418
Change-Id: I69eafcdb3bf6182d6f9d89e69e26d9391128365e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions