diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-22 06:57:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 06:57:18 +0000 |
| commit | 1979294b97dfab1c2e963beaa9925171de00339f (patch) | |
| tree | 67f52adb65da989558cfb08dd6a40fc4f791ec18 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 94e631e3ccc27ca01f7ecc9ac02717d0eaf08437 (diff) | |
| parent | feea4f580bdaa51cbfdf10684fea5a33fb1183eb (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 698ecf415a -s ours am: 9d2abd766e -s ours am: feea4f580b -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: I9f35de0d629a73a641a5a4b6dbe648236d1e815e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions