tree 752c403ceaf24413bb652221cfb6eb0051adf50e
parent 03217a9ec036199362ada9666b846f93b8932efb
parent 2415a31cd4d3b90a9c773e2d35a788e1bcf85e51
author Bill Yi <byi@google.com> 1630269045 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630269045 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I9b2b240eeb2575d14e1884a289b353d999581f81