tree e47578c259e482da854cbd1f4b38a82adce70806
parent 9c62f6786322ced9137c82bf8fa5e5288da236b5
parent a40c15717d83df4ccaa1a8b44995ad05ce82a395
author Tao Bao <tbao@google.com> 1501009509 +0000
committer android-build-merger <android-build-merger@google.com> 1501009509 +0000

Merge "recovery: Fix the flickering when turning on text mode." am: 771dfb0016 am: 276ff4cc33
am: a40c15717d

Change-Id: I2b6120ab9c2defddbb5a7a72ee6269c005a12b4b