diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-14 05:48:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 05:48:01 +0000 |
commit | a92473a2970b01ab3e37277e81c4995e504f5d37 (patch) | |
tree | 91811a0ae2fc41f1cfc7b3233c0b6e6906daf5e5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 31f05766bec2ad60a52450b199b2758c64456b31 (diff) | |
parent | c70f8b5873056ff11c97c45e57afbcfde70bf39c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9912b7e6b -s ours am: c70f8b5873 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860524
Change-Id: I86b196d44ff7c8c40a0ddffe224788a9d694940d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions