Bart Sears 3355f7a453 am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1 ...

* commit 'a476eed6b291d06f5e571597b928b7b2f0b3f257':
  getDuration can be only called after prepared. DO NOT MERGE

2012-01-06 15:46:58 -08:00

..

java

am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1

2012-01-06 15:46:58 -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