tree 3a00d1697c90b3e63ac5a7fef83534c18f74388f
parent 58be357ddb65960e71560c3474a56212b0021f4b
parent 47e6cc59473291979ed39c95adcd4ef57891e000
author TreeHugger Robot <treehugger-gerrit@google.com> 1596580179 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596580179 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e2a535da8a -s ours am: 47e6cc5947 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idfa615e6fd7d37ed9880859c87485913f25279f6