tree ae106c51a78b414ad55b887dfcbe53741dff2d54
parent 639a8ace5e75bb23967b7ecffbf34b46146dff0b
parent 4cd5b5de68d9639fba9f8f78c0b00067f9436589
author Android Build Merger (Role) <android-build-merger@google.com> 1499352379 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499352379 +0000

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