Commits
Steven Ross authored and Android Git Automerger committed 4751a7b0696M
am 9a4a0376: Merge "Stop FaceUnlock when detached from window fixes b/7222226" into jb-mr1-dev * commit '9a4a0376a78f9b3bcfe6374660fbe7c28797b36a': Stop FaceUnlock when detached from window fixes b/7222226
Showing diff to268185ee3c3