tree c29b75bd207b88e71d82409350c35ab894761ac1
parent e950af36a0b592a5d2e1bec81051e6a76e9de47d
parent 9233d47dc131a6b4b14da588e3be2dedbf359648
author Treehugger Robot <treehugger-gerrit@google.com> 1599320686 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599320686 +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: 9233d47dc1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5498a05dff878674476bfe201866406d3ba300ff