Selim Gurun 6b284507aa am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1 ...

* commit '51938e26913a98aa8de0292e9be8ea9d9ebc67c3':
  Do Not Merge. Move ssl callbacks to webcore thread.

2012-01-11 14:20:45 -08:00

..

java

am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1

2012-01-11 14:20:45 -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