am 13b82d66: am 85341a76: Merge "Fix keyguard dimensions; IME state for...
am 13b82d66: am 85341a76: Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev
* commit '13b82d66':
Fix keyguard dimensions; IME state for password view; layouts