tree c9e5cc728e671a5de21b72d7c756453b05db63ef
parent 4739de1147028f89dfeb094400d05dd24feb804d
parent 4ebbcff41b9e20499c4ba0cb9625b9cd96e707f4
author Treehugger Robot <treehugger-gerrit@google.com> 1599317641 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599317641 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: be1f367ae1 -s ours am: 40c724bf29 -s ours am: 4ebbcff41b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2ed81b58bb7fcc8e3a259e4716f71bc28643be59