tree 87611a13927dbbd03ed3a6efe9f44700c433b172
parent 40b26445f412ce663258681352d901200e63111c
parent 975541d9f0ea22fb55d175254bff67eef70d5cdc
author Treehugger Robot <treehugger-gerrit@google.com> 1619123013 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619123013 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7dbd97e972 -s ours am: 975541d9f0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0e38349750ff4882412782fe3838ab1ffe5f7dad