tree f38ac775b8d8011a4921975fc5fab358f25fa4c1
parent 26dac181d2ea36388251812c348df63f776508d5
parent ce6c8c71703dff61759aec43d61e8b8081961e22
author TreeHugger Robot <treehugger-gerrit@google.com> 1596474532 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596474532 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: afab5784ea -s ours am: c7bacdca44 -s ours am: ce6c8c7170 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie7ac162fea5ce304e567453a26b9587ce2f680c8