diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-17 16:37:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 16:37:28 +0000 |
commit | d557a6c339b9e0f1832ad1cf61c95ec0b7fb872a (patch) | |
tree | 71e1a4d9f8b278f60c595ad63e47d80555b97302 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4cb2f050d61fe29537cb4270c77aa59d65671e9f (diff) | |
parent | 5ac31bf823c0cb5d471c81810553ec9136aca338 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0d4e9ecbc0 -s ours am: 5ac31bf823 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887442
Change-Id: I58a92d47805c8e702418d7fddd3f6343cca3b07e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions