tree 830cc4936a95717c62ed10ef1fa66933ac860c6f
parent 7b46a5f0d8e7c8eeee850dfa57197b7d7abd62ec
parent 01ddc77c68b6a0abe243d582d941c12f4c913960
author TreeHugger Robot <treehugger-gerrit@google.com> 1604112934 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604112934 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I076efff5326090c0519ad9620a3cfbc9dd2f908c