diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 06:31:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 06:31:05 +0000 |
| commit | aff52cec2c74f4b711b7d9ea128ad5956526ba5f (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 371eeb1679e7f5d7cbf366e33d654097919f0562 (diff) | |
| parent | 20c9145c78694f6e8a1f998e850065405b7d4132 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27bdd0c39b -s ours am: a705017e8a -s ours am: f4bd0cda02 -s ours am: 20c9145c78 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12076170
Change-Id: I2faf7e4070136535c5dcac545b94a1e75010e627
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions