tree be9ea045aff4ca3b2b2f954df58d6e76db773c4f
parent 633aeba5944419109a3a08ac69de3d7b7c3b1dbb
parent 276ff4cc33f80054b01961b6684e4790eb2bddf4
author Tao Bao <tbao@google.com> 1501009268 +0000
committer android-build-merger <android-build-merger@google.com> 1501009268 +0000

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

Change-Id: I0ce7b6bdc85d17d38b9e2a1332556f90b80926a6