Jason Simmons f0b82d61f5 resolved conflicts for merge of faa81c82 to ics-aah ...

Change-Id: I7464f16940058cc9b5a3dba5cb839bc67129009e

2011-11-10 14:29:46 -08:00

..

java

resolved conflicts for merge of faa81c82 to ics-aah

2011-11-10 14:29:46 -08:00

jni

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

2011-11-09 19:22:14 +00:00

res

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

2011-11-09 23:24:07 +00:00

tests

Make operation counts monotonically increase.

2011-11-08 17:35:28 -08:00