diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 20:08:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 20:08:39 +0000 |
| commit | abd291b49206c51c5006297717a66d04efb73cc1 (patch) | |
| tree | 6d530140945393fd75867ee40070386e27aa38e0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 87763145f508ecbac5ece47f98475c12edb94e77 (diff) | |
| parent | 4318e4c4ea9b8f881e928f55d4029dc494cf0f25 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 06ba19ff4e -s ours am: e510c29b57 -s ours am: fddf7cf52f -s ours am: 4318e4c4ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11972643
Change-Id: I5b1c293ed69909aa961ac3f59497ae98976714d5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions