tree 769fb51235bb22f0115085379875b6db58af94ad
parent 2ce6882bb498c93af114626daa79cfa4f3f4e366
parent 7726289c2890d13baa3d10dc504b43e2128b4918
author Steven Ross <stross@google.com> 1318564935 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1318564935 -0700

Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341" into ics-mr0