diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-16 23:34:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 23:34:34 +0000 |
commit | 03e2b13100e3120864382e7085bda4547de6617c (patch) | |
tree | 7c2c08785d3b102dae5007b8aa7ea78f8cf8d4fa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1225b9cb162024df86d4055ab7d34aa959f3e41d (diff) | |
parent | 2e912866fc714ac0877528c66c6a4f02a9a4521e (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 384982ef62 -s ours am: e47deb8157 -s ours am: e242d03f17 -s ours am: 2e912866fc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872630
Change-Id: Ibcd9f6e41a6cfba58ae1d80ea2998e5d1cb22676
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions