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

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