| commit | e77d2a9c62e747902bc53d40e303214705702b00 | [log] [tgz] |
|---|---|---|
| author | Ruben Brunk <rubenbrunk@google.com> | Wed Nov 06 23:22:54 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 06 23:22:55 2013 +0000 |
| tree | eb25879667ba724a9fa9425dab1c90e13b7bbc46 | |
| parent | c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952 [diff] | |
| parent | 21a99ddd9cfd24c205f3483a56d4af5c83cbc6c4 [diff] |
Merge "Disable face unlock when returning from camera." into klp-dev