tree 7304e48696c65d4b6001ed32af3e050b153c6017
parent ef2c76aa01745ae00d24395b111afbf60ca2b85a
parent 8c0686e7026b5aac6884050fb63d8134d87e7744
author Bill Yi <byi@google.com> 1629243746 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629243746 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Id7a5aaee262f643a07e2fa9a44c8899cc0d7b944