tree cdb51d242c42f7de740b0cb310207914e5a23eab
parent 279d118bc9203fe2dfe5d1e537bbf73dad04fd21
parent bced8a0b49cf83ae7191a83af35cce087f1df60f
author TreeHugger Robot <treehugger-gerrit@google.com> 1608220284 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608220284 +0000

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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a8cb10d985ecd4c0a81fb1983265e5f9881568