diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-22 06:59:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 06:59:20 +0000 |
| commit | 803f13d320368a04ab9d7d6e701bcbefd9469eb9 (patch) | |
| tree | 27e95c6ace9d22e7855824e545c92224a1a922ab /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 457fe960237b9a6c04ec631ce60ddc94aeb62e41 (diff) | |
| parent | 160348659ec93bc5e382588467b313dcd21e35ea (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d94272381a -s ours am: 7422e9848b -s ours am: 160348659e -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532275
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifb2b809e84e29e39a4c7778e53f6c30c912a140b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions