tree b343aab5375927596ceec0061f64d1e1d1f35dad
parent b0460322432221bf576a08c991d7874d5616b9a9
parent 933c522579e7d9a055ea880192e89c515a216ac3
author TreeHugger Robot <treehugger-gerrit@google.com> 1640286312 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640286312 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d114d60575 -s ours am: 933c522579 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4f8469c78871bbe433c4ea88a77a62c992217f6a