diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-19 15:28:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:28:12 +0000 |
commit | 26fd2e1ba1dc85e680bebed54d8dc7bc8abb2f87 (patch) | |
tree | fd5212ce314d91f45f8ffd5305800846e871e936 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | bc1a6c158976f6b4e987be4f5b47b8aa32fe9fa6 (diff) | |
parent | 361164f977e37b74e7f70e5cb184354d75b54b2d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: d3f766ee0f -s ours am: b94d0f3187 -s ours am: 361164f977 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187676
Change-Id: I4dafda4c6811ce078eb1db3f750c73059b10377c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions