tree 182bb6cbd83a7ba0798ee135445589e5495f7640
parent d0d3869dcff1d0529db9223aaa12784d228306df
parent 2415a31cd4d3b90a9c773e2d35a788e1bcf85e51
author Bill Yi <byi@google.com> 1630269004 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630269004 +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: Ie84a925211285a764c077de2802fee37ec325f05