Michael Jurka 5f9d991b56 Merge "Fix the build"

2012-02-14 14:56:21 -08:00

..

java

Merge "Make textDirection API public"

2012-02-14 14:45:51 -08:00

jni

Update comments

2012-02-14 09:17:59 -08:00

res

Merge "Fix the build"

2012-02-14 14:56:21 -08:00

tests

am 5f5ea91f: am eb56ad18: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1

2012-02-13 13:47:45 -08:00