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