tree 2cfcc7682e8ead397f2668c47cf27bcb081bebf0
parent 74ae65bca0995d0d4973217755de8f194abac94d
parent c6b0a354105ec9a1b20da02939da8683743d8517
author Bill Yi <byi@google.com> 1630269568 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630269568 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I4aca5c4d8e0246b494025225942d0496af7e367e