diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:21:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:21:05 +0000 |
commit | 49a6a40798dd1e769db9f47fd8a2a747f1419c47 (patch) | |
tree | 58fbabf65039e97889bc8fb11492019a3e8a696f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4f08143bc93deb6227c09d4a52430abb0ac7ad4a (diff) | |
parent | 97900e4862a0ddc49c5b22fbe8b36a5c278c7225 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 45b2fcf55d -s ours am: 101de7aae1 -s ours am: 97900e4862 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937072
Change-Id: I7208c3d9591d44e6fbdec48730fc2492f5a523ca
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions