commit | 332ac458068a34522c9a8273ef9a0fa9bd4d1bcb | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 13 17:00:11 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 13 17:00:11 2021 +0000 |
tree | 949d3b83d38b8e7890aa86d9bee78766689334eb | |
parent | c2e66f44b7362121172ed3f61b858a54d56dde93 [diff] | |
parent | cd1edf4e57232f0c62609d33490e7737eb7b8d14 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c55482fcde -s ours am: cd1edf4e57 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14172965 Change-Id: I1441515e34abc6f541462a605a391b07d8089a86