Gilles Debunne 91a359e0d1 Merge "resolved conflicts for merge of bd38710b to master"

2010-10-10 14:00:43 -07:00

..

config

…

java

Merge "resolved conflicts for merge of bd38710b to master"

2010-10-10 14:00:43 -07:00

jni

am 22cb4ef8: am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread

2010-10-10 12:52:40 -07:00

res

Merge "Fix 3082859 - missing mdpi text handle assets"

2010-10-10 13:46:08 -07:00

tests

am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread

2010-10-08 17:57:55 -07:00