diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 22:18:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 22:18:18 +0000 |
| commit | 320bf6efebbad9ed863b8e959f0aeaa21758fbe3 (patch) | |
| tree | e1fd5c9113c23e3dfe3dd13a402374634a65a958 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d40752bff239c73e308e7876893dc2958ad3cf3a (diff) | |
| parent | 4130d199f6d14985272a2168c55ba9a059b262b3 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c6a6e01484 -s ours am: 4130d199f6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13170875
Change-Id: I8ebdeda0bde7db3c7aa9bd3050701054eb0dec80
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions