tree bee7682b401932290b0a8affa3cc0dc1a12c099b
parent b8da09b3969179e7eff7292a89271b7b8890b1ec
parent 66a625cfcf525200acc27b61563c0c10072173c0
author Treehugger Robot <treehugger-gerrit@google.com> 1599283656 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599283656 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours am: 66a625cfcf -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icd0d9a7683326f0f5c5230ccceeededd4afce81a