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