diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 02:20:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 02:20:28 +0000 |
| commit | 79ac7f0534a053dbf1e5bf4a37efaf5d1bebfc09 (patch) | |
| tree | e0bf27aa85c867e9769fc1c520a7851d649cea65 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 83fc998a1335d75ebc953a7660524f6bfcb2500f (diff) | |
| parent | 1d3930448f2e9ad09410a07d0b1558bb87223c59 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1d3930448f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13168483
Change-Id: If19b2b2435e5c5172f5081ec94d6b2bf276261f0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions