tree 4898eb81193601c796c6b6efa636b3cbd9ee1e38
parent 8b369651756ff2886b136ea290947daa8b7b86fe
parent 1e324fa459401d1435c2fc910307735dd9ec449c
author xinglong.zhu <xinglong.zhu@spreadtrum.com> 1470679659 +0000
committer android-build-merger <android-build-merger@google.com> 1470679659 +0000

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

Change-Id: Idae46562d2b8d1db76f7b75fcef58b00fa6c3790