tree 5feffc0eba63cac9df8f0b9f58a268a88e526bf0
parent 82bb55cd55f063081f8c4cb674db0f978e0da1ee
parent d03af44317bb3d580b6dac25a857caa78d89d6ee
author Bill Yi <byi@google.com> 1631453811 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631453811 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54296def63 -s ours am: e658dc422a -s ours am: d03af44317 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0f2cc04eb378902ab1192a039e64867965747070