diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-16 08:35:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 08:35:48 +0000 |
commit | 47285f6f0d1586089abc721244c0ad717de4a020 (patch) | |
tree | 9f7ed84ff0a448f9da7adf267f25379651ebda49 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | d74a33680c36321be9cd150a02a8f85a9ad72c91 (diff) | |
parent | 7ff2385623a14f4624835a68f12e92cd37c59b0f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 345a4d331f -s ours am: 7ff2385623 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12164903
Change-Id: I92b2895447955c73a6e5b2b5599aa79f8c72bbfb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions