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