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