tree 39db6838aec77d4c0de6e679b1179cb65c8972b1
parent ab93af3c4483bf8be9eeb07ae785fec5fdef95e3
parent 7c6a1b2f87b7f4f83a52e9a9c6056b69bb5b5a1a
author Bill Yi <byi@google.com> 1627656839 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627656839 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7c6a1b2f87 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ide9da06929ae5176883f2902e75c3b8f98c48d49