diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-12 18:01:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-12 18:01:36 +0000 |
commit | 559601bc20dad8555e8d531ed2742b86161c35e9 (patch) | |
tree | c70887f37e0e662ad794545a041b5f10e31f10b5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 758028b1123e1ed2dc2aa7031845d08e07c283d1 (diff) | |
parent | 27bb7521ba5473c75033f3205a8d2b95bed848f0 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 27bb7521ba -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14158298
Change-Id: I90c8ba458dcb20c20a56ae2c52a00d3c32158c44
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions