| commit | 9cd3b1218e8789aed5e8c746568e43ff4e5481b5 | [log] [tgz] |
|---|---|---|
| author | Ruben Brunk <rubenbrunk@google.com> | Wed Nov 06 15:33:39 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 15:33:39 2013 -0800 |
| tree | 4ad001cf97d199bbadf64ffc6bc2ca5ded905b68 | |
| parent | df220c5c59f781e7f4dbf507169755163c2b1439 [diff] | |
| parent | df049d6f2270b06679d51021c97eb9559f2657b7 [diff] |
am df049d6f: am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev * commit 'df049d6f2270b06679d51021c97eb9559f2657b7': Disable face unlock when returning from camera.