tree c29b75bd207b88e71d82409350c35ab894761ac1
parent 90ebe1612e8976f5902b4dd2fe168063fcc723f1
parent 1bb9e29e4f2ef45691d581e565c92e9cf97af0ed
author Treehugger Robot <treehugger-gerrit@google.com> 1599285358 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599285358 +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 skip reason: subject contains skip directive

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

Change-Id: Ic25c2e925ea8f20ca247ed59628ca599b742da86