tree 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9
parent 0832e15d77656e07acdf5e7565911129b59a192f
parent b1ee63639f7933f4d6fa40fbfbdcc9f437af582c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594046165 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594046165 +0000

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cc4a65b365 -s ours am: e861ab7cb2 -s ours am: 4b4922186a -s ours" into rvc-d1-dev-plus-aosp am: b1ee63639f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib7364bebef5a6381186eef9f979f12c1364e035e