diff options
| author | Xin Li <delphij@google.com> | 2020-07-24 09:20:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-24 09:20:22 +0000 |
| commit | aeebeb89c6f3314c817794dd0cca589b35a6d41c (patch) | |
| tree | 8954f1d8bc317a1e3b1d929b0454c6a502e9aa82 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6177a513cee09987239afed9de1fa905bff41e05 (diff) | |
| parent | 6e7da04ecf53b0a194f479e9010705b32c0ee09b (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: 6e7da04ecf -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: Ie41b07aeace1902ae7f167c29e1c19d87d8b935f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions