tree 4728848db0561dba72015c146f37b83e3a6c5ed7
parent 4d0d995f2e48ffe58d8c9ba364f755fa167aed75
parent f7527ca97018856b6c57cb4cd9e1d5b440e9a806
author TreeHugger Robot <treehugger-gerrit@google.com> 1604034299 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604034299 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 1fcc7833e0 -s ours am: 91b26f8f83 -s ours am: 34407ea59b -s ours am: f7527ca970 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I359b4442d7022718d82593cc2a418e4d5737a0b3