diff options
author | Xin Li <delphij@google.com> | 2020-07-24 09:02:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-24 09:02:01 +0000 |
commit | 6e7da04ecf53b0a194f479e9010705b32c0ee09b (patch) | |
tree | f3b7c40afb3caa22be6a46837f1e6b18f3153562 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5cf151b9da60961e76fc025ca35f2d9dee3e74f3 (diff) | |
parent | 4c67764ab88f12d05d6328ca502edca142c0ab5f (diff) |
[automerger skipped] Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev" into rvc-dev am: e303dd658d am: 0a0327668a am: 4c67764ab8 -s ours
am skip reason: Change-Id I5f50166322b662b457e1b79b2ce62c622ddd1013 with SHA-1 6c01bf5f87 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203661
Change-Id: I1a084ce3551632ce1301a252a111afa295dbf73f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions