diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-22 07:00:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 07:00:32 +0000 |
| commit | 6ec1788e74e67f09862a8477b8e3b56976b01376 (patch) | |
| tree | 27e95c6ace9d22e7855824e545c92224a1a922ab /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4142de2e84d7cf0c3d1677cf659ad0b1a29d466a (diff) | |
| parent | 1bc3c07859599a9f0e9239148f172fb103066f18 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 96db3dad2a -s ours am: 7861bbb7e4 -s ours am: 1bc3c07859 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532303
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5eff0ea044876a271bb89a36805bc003d2d8bdea
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions