tree 2993d4b32a868c0c7d45fc293508f8a25de11b56
parent d9aceb57f65d66733fb256343a0c9f2eba4d1244
parent 3806993e2532704d6569b67352fce9c42650fd74
author Tao Bao <tbao@google.com> 1483558037 +0000
committer android-build-merger <android-build-merger@google.com> 1483558037 +0000

Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841
am: 3806993e25

Change-Id: I68a27e971d8f786ae669e3bbef4218ea2ca1bbcd