Adam Powell bd1bb1d075 Merge "Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest"

2011-09-19 09:47:01 -07:00

..

java

Merge "Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest"

2011-09-19 09:47:01 -07:00

jni

Revert "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits"

2011-09-18 12:54:38 -07:00

res

am 31f971b5: Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom

2011-09-18 16:58:20 -07:00

tests

Merge "add upload capabilities to data test."

2011-09-16 17:48:17 -07:00