tree ae106c51a78b414ad55b887dfcbe53741dff2d54
parent 54a327a0c2522bf7285a5302f7f8769219597446
parent ab95597f8593f8a8b7ace5596d97015b2da9fa6e
author Selim Cinek <cinek@google.com> 1499352319 +0000
committer android-build-merger <android-build-merger@google.com> 1499352319 +0000

Merge "Fixed an issue where the lockscreen could be all white" into oc-dr1-dev am: f96da7ee6f
am: ab95597f85

Change-Id: I09a8181bcddc14462cb0756fcc4977636b7d4698