tree 0ff03f99e09e4f02e439512e27cbaffb8ea193e3
parent 2ea15590a6dac6ad69c8061365a8aed8b2d7fb55
parent 74e0ecb25bda6a1c01355d22e3e20bdb3226f3ea
author Tao Bao <tbao@google.com> 1483558308 +0000
committer android-build-merger <android-build-merger@google.com> 1483558308 +0000

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

Change-Id: If03ce22edaee2cf9aa38f3ea90ee992cd06695c3