diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 18:49:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:49:28 +0000 |
commit | d2a5c2470119f63ec4d5e72348dd5d991399042e (patch) | |
tree | 86d487a4b3628a3f6095fbe2b1a477d05de371db /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | db7070bff6c1ee01dfa22ad4352bc8beeed1f416 (diff) | |
parent | f164789d8ffa4bf81eafeb201c28f833c4a16ac6 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: dffcd5fe7a -s ours am: be8cba0fac -s ours am: 7dd6b5bb5c -s ours am: f164789d8f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11961575
Change-Id: I1d981556c5d8fb2064be910a2528ecca967f01b8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions