diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 20:13:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 20:13:19 +0000 |
commit | 26c928e7f5cbe5cb8eba90e6bb3ac9488a8acd10 (patch) | |
tree | 1153f366e1fdabb5efed5cc84c21d899ab0bce10 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 41848a381e6630c14c2f8f4c37085a8b1b1245a2 (diff) | |
parent | 94f6045361e4c3aa830660c8f7cf63832be36490 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3c26551d2b -s ours am: 94f6045361 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916186
Change-Id: If53d5554343d79ba69255045959ddad53b6d4b42
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions