tree 83f24828bf720dfe33bee3cee5c15b458e423438
parent c7901e9194391f13b0bf0dc595b27141607cfc46
parent e9fe9225e39c5cbbbc8960b745f6687e3adbc66d
author TreeHugger Robot <treehugger-gerrit@google.com> 1594566709 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594566709 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77e3cce083 -s ours am: e9fe9225e3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I76f029c247abbfbcec910debcb92501c259fc987