diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 17:23:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 17:23:02 +0000 |
commit | deae5e78e0c54477af65e8bad26760bb28b3166c (patch) | |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 87e9697fb1a384f23bde6c78a13f426060abac91 (diff) | |
parent | 49f19dd01cfb676b62c8e744f03bbdf934a3e870 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 49f19dd01c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13169558
Change-Id: Id64fe5cc2c6218fab89dc8a3bfaa2db35579e4ee
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions