tree 68fc8fd030e4269e18d9882fcff64ba525962e5c
parent 469222d860dab5c3e3349750bb6a82fb4ba78736
parent 2d754228720e7197f28c2489e377f024ac9070a3
author TreeHugger Robot <treehugger-gerrit@google.com> 1606147742 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606147742 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I4220b7c5a583f03f1a85395066af4a1ba522d488