tree 9f71fa193053a0476a4d9b4c86b36ef2247862d6
parent 32a7f2c1c7c22bc7a6912ceda8c16f8309b8e112
parent 62be2695703f7721172b91f5a7a1a7f3528027eb
author Tao Bao <tbao@google.com> 1501009960 +0000
committer android-build-merger <android-build-merger@google.com> 1501009960 +0000

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

Change-Id: I75bbd4830db86ff06694d970e6a4ca4912707401