tree 200c082874ba0f18e37125cc2c219b132b6a1256
parent 34d82e51176f556919420d7a5b5ac6e4de2fc77d
parent 96860e0ecc413b9893d0763791cd49f33365357a
author TreeHugger Robot <treehugger-gerrit@google.com> 1592112892 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592112892 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 96860e0ecc -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifaf6e0a67919191f9c1a0599b5beaff02cfded75