diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-06 14:30:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-06 14:30:48 +0000 |
commit | 463c09f4edf27822e78ed3d04684fe8e6e65b21b (patch) | |
tree | b3963b616eb3781c5f8bd4f1cfced083132a3f44 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fd1d23021cdcdbbb3fa50b33e0f35568bb54cc98 (diff) | |
parent | f7b50697d50eb7fb2eacfd522e15ffedd9b4abfd (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c4c8e17c99 -s ours am: 076aeabba8 -s ours am: f7b50697d5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11761986
Change-Id: Ifdeb9dcc236b0358f3e39a2329555b0ff22b2911
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions