tree c9e5cc728e671a5de21b72d7c756453b05db63ef
parent 7be4ab0f9d641fb3caa32b9f4506ab0d46fd4f7c
parent 932108123a9e051df3234eed80930261020b03bc
author Treehugger Robot <treehugger-gerrit@google.com> 1599284427 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599284427 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 740f9a6a91 -s ours am: e3738078e9 -s ours am: 932108123a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9da4f9f97f3af0a5e5c807304cf91f24046852f5