tree 39199495c60d68dde3303709ef53bb7bb1fdbf06
parent 8d803258ca1550583d03c1a24c5c6d4b38535ba8
parent 9d34f9db81311a931ae4016161e1c927dd2a69d1
author Adam Powell <adamp@google.com> 1352245811 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1352245812 -0800

Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev