Narayan Kamath e61fd281a8 Merge "Remove BlockingMediaPlayer."

2011-12-09 06:30:14 -08:00

..

java

Merge "Remove BlockingMediaPlayer."

2011-12-09 06:30:14 -08:00

jni

Clean TextLayout code and remove RTL_USE_HARFBUZZ

2011-12-08 15:16:17 -08:00

res

resolved conflicts for merge of db81dc72 to master

2011-12-07 18:18:58 -08:00

tests

am 96f660f4: am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

2011-12-05 16:32:59 -08:00