tree 3fa1a57e64c5b06c4fcf18893eaec277e9d65360
parent 3f91e43eb00764cebfdffb42a3ddcb723ae439e0
parent 3af630c8d18bcf4b23a5a308917319dd04cc8ed2
author Jim Miller <jaggies@google.com> 1348786353 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348786353 -0700

Merge "Update keyguard layouts on phone" into jb-mr1-dev