tree 0323ff1609c3c60dbaac767014a477d766f4f758
parent 366a8eda5830c574787c965767073d2d335dc875
parent 70a9269192efeb229bf792f69e042ffa464acf1c
author TreeHugger Robot <treehugger-gerrit@google.com> 1603326191 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603326191 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I4c25466f8f8f4b5ef8398273fe626bfe84eae932