commit | 317283007a52992d3b21558442ce6e46a8caeda7 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 17:20:03 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 17:20:03 2021 +0000 |
tree | 219e60d3860f955446dce898ce98e35e1f179c65 | |
parent | fba588f2e26e618e99b5848fcdf07334d2a72a01 [diff] | |
parent | bbbc466843e5d3b4bee93ca65701b88f20caebdb [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 484eb23a34 -s ours am: bbbc466843 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755768 Change-Id: I06f8f61e2ee9ef00845535cfa6cf216dddb6a580