* commit 'c40f70a5cb1f24a9ea0b5b0cadea75db8fc1cdd3': Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
* commit 'c40f70a5cb1f24a9ea0b5b0cadea75db8fc1cdd3': Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.