tree bb06f87431f1e31213e87d14f45f27b146d5dd3e
parent 0a11444d8ded42dbcf3aa7d76b12b9fde22916ca
parent 7d23243e2078328583b624cd7ad5e9cbbe6aea0a
author TreeHugger Robot <treehugger-gerrit@google.com> 1606196729 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606196729 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I4b8bde13eb22aa968040e63f0e6abd9ad8c45a74