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

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