tree b385aba4a756d9f039121061d2eb2a0550c79e44
parent ca94ed03508c52e3c31a08f72d60bc298e4861e5
parent e1e08fc8d1276d3f2499f41da2a5cc89a9e9aa68
author Treehugger Robot <treehugger-gerrit@google.com> 1599318117 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599318117 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Iaaf0aca6158ef915761a658361b747d7300b93d1