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