tree 398fec3395cb56af202c17d308e00a1c3cd672ce
parent bafa9fb77ebe37e3d221199fc057052a7948ecb2
parent c710e6f3331ed4aa12dbddb3c9f08967e5a60a6e
author Bill Yi <byi@google.com> 1596583738 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596583738 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I8a3bf4972a6093bad42bc36d949dbe2d33147d9c