tree 1e1f623dc36881afd8a8c8f98ea80d285cc16000
parent 7ff55358951eff80c95a55c9bc4b0a113f237217
parent ddbf138d11d9ad4fa9ec871b2fc5862dad20f02c
author Brian Colonna <bcolonna@google.com> 1351643556 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1351643556 -0700

Merge "Fixed misplacement of cancel(X) button for Face Unlock" into jb-mr1-lockscreen-dev