diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-24 18:10:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 18:10:32 +0000 |
commit | a2d39223f35887e9754b924c1bdfb1404091ae40 (patch) | |
tree | ff98d1580b87811cfd7d82ea116b339ccd57bd41 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 84f91ae56bc1b12667162f72331c74eaa7c0e73f (diff) | |
parent | 65baeccdd8258af76dae7f3c2aeac6ac13945c81 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 65baeccdd8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980785
Change-Id: I8ebc2e410dacb397c902f5df51fe25e656254ade
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions