tree d5a5a327d6bef024d5722af9aaaa0b6675296061
parent 17696d2ffc813801dc59bd9ec4eaa20689ea925b
parent 8c4abeb23f126730aceedfd675829b0be06b5bed
author TreeHugger Robot <treehugger-gerrit@google.com> 1607134770 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607134770 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4c94b4110 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib834162e8b11993eb5a9f8cf4ac3dbb32305da53