diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 09:19:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 09:19:55 +0000 |
| commit | 01a817bd9bd71a36ac1a8bc3375055c5ef3beefc (patch) | |
| tree | d071c12d33cd7bd89ec76b00223e794b2b06c2c8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7a8f5068150528655bd0c9f3fbba344bf57a864d (diff) | |
| parent | 4a67c2de34711cf1d5346ae11b4bbb374698897e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6ffba8f337 -s ours am: 222ea67d6b -s ours am: 4a67c2de34 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515760
Change-Id: Iaeb0e95bf23d2a846dd1b03585b18b40a01431c8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions