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)

Trivial merge