am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet...
am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev
* commit '9ff6d4f8':
Keyguard sanity checks for when layout is not yet complete