tree 7be7aa2003a01063b2c1551828eb8091a414c1ed
parent f17272dd7e927fa991d3a3d96dfb312ec1a0e1e7
parent 85dca6379af951eaa821f5d7a60b8b6edf3fe27f
author Bill Yi <byi@google.com> 1628900378 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628900378 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a74d94dde7 -s ours am: 85dca6379a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ief5148e3c8321ee816fce32909b1a3d9cc82b69e