tree a9ea46da8484e8b822db6f887c270da6f0afb77d
parent a5dd2a452c9fab12996863cd407aa14c625a604e
parent 4c4323254e7fa8887283f9cfcbc059785f78284b
author xinglong.zhu <xinglong.zhu@spreadtrum.com> 1470679989 +0000
committer android-build-merger <android-build-merger@google.com> 1470679989 +0000

Merge "Recovery mode UI flicker" am: 629bde8c6c am: a5734c2ad8 am: 1e324fa459
am: 4c4323254e

Change-Id: I49e9da06bd509668c70b3f3cebb505a2a4868bfb