tree b68d9d8abb15f933c549633519b56f7481650648
parent 76d1c4567497d9064d65931cbd78434cd8fef402
parent dcfe628abd00f5cf5fdd83c39243f6e9c52fee79
author TreeHugger Robot <treehugger-gerrit@google.com> 1618209706 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618209706 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ebe037549b -s ours am: dcfe628abd -s ours

am skip reason: subject contains skip directive

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

Change-Id: I90a163297a564c2108a164b2b76447e40ad1948e