tree e35182612b0b7dcb5ef2bc8a386955cebd6c21cc
parent 41369c7d655eff4a69d769c296ed07d785e42ae4
parent a9912b7e6bf7cf564ebe5408e8876f1860b7c443
author TreeHugger Robot <treehugger-gerrit@google.com> 1592113304 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592113304 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I33c50d0c94a6c3e2b66d9b9649067d68f21c9540