diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-13 18:25:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 18:25:29 +0000 |
commit | 8ec76482fac9655ecc43f1e2ec45d52c28841655 (patch) | |
tree | 5d34087236ff89637ac5a201ecaefcda11ecdc72 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fa811843fec84fdeee8ebd8e626673f1814c0ab1 (diff) | |
parent | c0d744e6a1666ac4e2df084664eaeb1b1973954a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c0d744e6a1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14171945
Change-Id: I0308e8d2e22a840a06b3a9a36c629d9a682049e8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions