commit | 4ffac6d06d277843602793c1a07127d8b549b6d8 | [log] [tgz] |
---|---|---|
author | Steven Ross <stross@google.com> | Thu Oct 13 21:04:15 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 13 21:04:15 2011 -0700 |
tree | 6af1e11c0fdf6c5b8c78257eced55a774e193e66 | |
parent | 507c1f75aa6e47ae40dc3c9508f581692494b756 [diff] | |
parent | 5f79dbff1fab0f297943a1e924616da7a6226cd3 [diff] |
am 34068869: Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341" into ics-mr0 * commit '3406886939b0f28c426acefbe9dc77292210d8b4': Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341