| commit | 9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43 | [log] [tgz] |
|---|---|---|
| author | Ruben Brunk <rubenbrunk@google.com> | Wed Nov 06 15:26:48 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 15:26:48 2013 -0800 |
| tree | 9aea9c26eeb9278e2ffd1de9260c33a336b540cf | |
| parent | ea18624ae557a06e49748964f951a81fd6c48370 [diff] | |
| parent | e77d2a9c62e747902bc53d40e303214705702b00 [diff] |
am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev * commit 'e77d2a9c62e747902bc53d40e303214705702b00': Disable face unlock when returning from camera.