tree bc163ba196ce38ad2b7503cfa740bb3f8db2fec7
parent ce3302e3efc497c355b8141d79d63f4a9cde73d6
parent bf5151fe5a228b63a098af3a868c3dcc8f2ee270
author Bill Yi <byi@google.com> 1631455069 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631455069 +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: bf5151fe5a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7688540c81c04e0d66b13c0ea426bf1afb531682