Shimeng (Simon) Wang 610d92f4c9 Merge "Use the default scale for text input."

2010-09-10 09:39:34 -07:00

..

config

…

java

Merge "Use the default scale for text input."

2010-09-10 09:39:34 -07:00

jni

am 94db0238: am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread

2010-09-10 02:39:10 -07:00

res

resolved conflicts for merge of 62d005ec to master

2010-09-09 23:06:27 -07:00

tests

am 0c592acf: Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread-plus-aosp

2010-09-08 20:26:50 -07:00