tree c43b959ebcbe451da1190f98d4d90e0d35e58932
parent 573559b7761169fc469d07b720d6c157588f0d61
parent f3a7728fb97339856bf468c75b9cbb62bcd5be06
author Treehugger Robot <treehugger-gerrit@google.com> 1599285389 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599285389 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f3a7728fb9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6c24649f35461f2eb7b374df9705ac0bf4f494db