tree 5af61200cc18b111678c779a109ada623394a8f5
parent 49b4056dd67870c1c15f19004da3e9b2d50b27d9
parent a9073cb03e4ff893103f41a33a767bdec1b11a17
author TreeHugger Robot <treehugger-gerrit@google.com> 1596984469 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596984469 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ic55aa88c748f10d8945e0ed9b97454727d577502