tree ecc46b06c4305f3bf054fbab6c29e020b145a553
parent 69b0c974b5abb38a4443410cf09f7d5f28cf2c7f
parent 9a9f4ce1e2522f020b72a08161c1c3d244dd5c68
author Steven Ross <stross@google.com> 1350434692 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1350434693 -0700

Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev