OSDN Git Service

Merge "Disable face unlock when returning from camera." into klp-dev
authorRuben Brunk <rubenbrunk@google.com>
Wed, 6 Nov 2013 23:22:54 +0000 (23:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Nov 2013 23:22:55 +0000 (23:22 +0000)
commite77d2a9c62e747902bc53d40e303214705702b00
treeeb25879667ba724a9fa9425dab1c90e13b7bbc46
parentc9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952
parent21a99ddd9cfd24c205f3483a56d4af5c83cbc6c4
Merge "Disable face unlock when returning from camera." into klp-dev