diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-24 17:57:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 17:57:10 +0000 |
commit | 397fe00ab016f25edec873f51e6cc2b62fb970d3 (patch) | |
tree | 2fbc8abfb8063463f6de93a7bc824838f8c72c2a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 44f8030ac520a87b7dcc6342039e96976b5dae5f (diff) | |
parent | bf3033fdc2068e1c7e3d5f41f043a71f4f8fba74 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 2063d3cd70 -s ours am: bf3033fdc2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980782
Change-Id: I05f91a3bebb846b67b67f6fbaac0e763b56d3baf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions