tree 92a2d7d3ea8ecfaa1aa7304d5667cfbf25c1d2e4
parent 63e7d398e914f61a280918d03313fb8a055ffe8e
parent e950af36a0b592a5d2e1bec81051e6a76e9de47d
author Treehugger Robot <treehugger-gerrit@google.com> 1599286909 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599286909 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3202d82adb -s ours am: c07f2aa249 -s ours am: ca94ed0350 -s ours am: 5f513949c3 -s ours am: 1bb9e29e4f -s ours am: e950af36a0 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1420265

Change-Id: I4b7a75cb7148d5b063340714c8c961877e929fc0