tree 7c059e789361fef264cd4b8ab8caa3572fb9fc26
parent 68f592a8210af27df4339089bbee47fb602cae6a
parent 48d50958af05db84ea787f5e4096ff40307ec804
author Jake Hamby <jhamby@google.com> 1323388293 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1323388293 -0800

Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1