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