tree 0086bc7f9cfd7055094342ae341610753985d4a1
parent 4535c9cfc1bbfa0ac13a3f643c65d41556e00b8b
parent 588dae0862132275d7f0acd62c50cc691da3d052
author TreeHugger Robot <treehugger-gerrit@google.com> 1593281369 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593281369 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I3c6a6d015f2cd2e9b894810f5bf52c78c6ddd116