tree ab71eb4071245ffe7783a28b58af7ef6e52f266b
parent efdecddaac2eb299f96a85fe4d52d24316108c72
parent 3b870faae2471e98347af9342fa6547bd83ede4e
author Treehugger Robot <treehugger-gerrit@google.com> 1619127395 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619127395 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9df2d8e6bd -s ours am: e17d51b01e -s ours am: d2ef32c095 -s ours am: 3b870faae2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2fe31163b2b030163ac90d22310186515faf4799