tree b385aba4a756d9f039121061d2eb2a0550c79e44
parent 1bb9e29e4f2ef45691d581e565c92e9cf97af0ed
parent 50f2a5cabbcbca95075f685fd55bbebdeae4c595
author Treehugger Robot <treehugger-gerrit@google.com> 1599319699 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599319699 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I380356c6051f1671972ebd6282419c56d65c97df