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