tree bee7682b401932290b0a8affa3cc0dc1a12c099b
parent 161dfbf4673a58b3b5ad14e31197783b8d59c1ec
parent 91e53f88c44da4ed0d52e88ee10c3faed1af87ca
author Treehugger Robot <treehugger-gerrit@google.com> 1599315570 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599315570 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5df84b4f36 -s ours am: 91e53f88c4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie7987499fc524b131b7aa8d6099b542593dc9918