diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-10 04:33:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-10 04:33:31 +0000 |
commit | bd8e63545b73ee36449fea76b979795778e97775 (patch) | |
tree | fcea5dcf1899ed6e1f93de9ceb1c78e01a61bff2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8dc1bc6cbc21f93522b90fa612e4ab4db3078b77 (diff) | |
parent | fe45cc15b7916b8ea7b5903a1eccd62d4a8a1fef (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fe45cc15b7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14145985
Change-Id: I35efdc93b0163b48e72c2c76ad04127b7700c326
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions