am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock...
am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
* commit '555fe79c':
Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.