diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 01:45:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 01:45:31 +0000 |
| commit | 1188f07975cd66069f6068f68c0854939bbbf723 (patch) | |
| tree | f314a575bd9e3adbc24c136ca817020299d2020c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a23e29dd54742a2f4690f1665b2f2c8571775831 (diff) | |
| parent | 43662e1979b665bb24d1db5123b2b18af66bc97e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3a301e8671 -s ours am: 493592907d -s ours am: 43662e1979 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515857
Change-Id: Ie22df438840cc26502298ab78b34f841d88ac4c9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions