tree 26da2b660044f205549652cbf2aa2abf47f06e3d
parent d6e89f519a55eb13e63e0d5ade7358951551795e
parent 6e43f9a50c0c84101473a4344ea1e7105083b29b
author TreeHugger Robot <treehugger-gerrit@google.com> 1599116075 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599116075 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b14bdbdd74 -s ours am: 0d0dc9fa8b -s ours am: 6e43f9a50c -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12517473

Change-Id: Ia11d48e656cd6b2db7a581962f93b66a3615b448