Merge commit '5ee51f07356b81ff2b026ef864f2f6349994e3fc' * commit '5ee51f07356b81ff2b026ef864f2f6349994e3fc': Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.
Merge commit '5ee51f07356b81ff2b026ef864f2f6349994e3fc' * commit '5ee51f07356b81ff2b026ef864f2f6349994e3fc': Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.