tree c0c7f5ca1c085f4c1499545164ba4316497ecaa1
parent 485f0b418d3a4ddc46d63d0fa365681de4ca0994
parent 760d1d10f275341230f343d5007aa3bc66797338
author TreeHugger Robot <treehugger-gerrit@google.com> 1640286442 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640286442 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 760d1d10f2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifdab82ad46135ab7dfdaa3ac3b54de33f62ae792