tree 488df6b1349787a0c56344e93c00b3c312c581c0
parent 1c9833d44c1dceddec87e8a5279efe0f89c1e8f7
parent 9fe668c0a932f08d7fdf3f7cca6cf9bda0033cfe
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629003418 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629003418 +0000

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours am: a4712801b4 -s ours" into sc-qpr1-dev-plus-aosp am: 797489f58d -s ours am: 9fe668c0a9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib18d8e163c251370768a6496b8f3d82a9b313f48