diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-27 18:41:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-27 18:41:53 +0000 |
commit | 153e66b1af9418605643e35d0fe63d3ff8547400 (patch) | |
tree | ee3804b43bb20a0cbbde63169c77ea906bab2448 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9113dc9a4c651a700b0b15aa3c1e13b3095af331 (diff) | |
parent | 8c4dc08974e1a2f374194d138ffae660f43bdf3a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ef99fbd9ce -s ours am: 4535c9cfc1 -s ours am: 8c4dc08974 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12018922
Change-Id: I3d8775a7d36fd6896aa3fef8dd674bdfb82b741a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions