diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-20 19:25:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-20 19:25:20 +0000 |
| commit | feea4f580bdaa51cbfdf10684fea5a33fb1183eb (patch) | |
| tree | e36c6ce46208c3ce37e12327dd1f2b8a4f338e49 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fc0d3cf55338fe8dd2e142a445682663511f2cb7 (diff) | |
| parent | 9d2abd766ea575a5615898fffca3a620ab9c473a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 698ecf415a -s ours am: 9d2abd766e -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534219
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6b815128a67a399e134e9dbbe191e4e0fcd4e8b3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions