Jim Miller f33359453e am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 ...

* commit '62fad7689567bed6ec372401c1b171659c28572d':
  Fix 4560303: Add setting to lock later when power button pressed

2012-01-10 10:31:56 -08:00

..

java

am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

2012-01-10 10:31:56 -08:00

jni

am c1d03cff: Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1

2012-01-06 14:21:12 -08:00

res

am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1

2012-01-06 14:09:41 -08:00

tests

Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

2011-12-05 15:52:34 -08:00