Jim Miller 524a0adeb5 am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 ...

* commit '5943c1dc406574b360e9cb1343a5dab00a84a8e2':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen

2011-11-10 16:15:14 +00:00

..

java

am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1

2011-11-10 16:15:14 +00:00

jni

am 698d3de6: am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1

2011-11-10 16:14:43 +00:00

res

am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1

2011-11-10 16:15:14 +00:00

tests

am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1

2011-11-09 21:51:38 +00:00