Joe Onorato 3f24a5b348 Merge "fix the build. more string disambiguaiton."

2010-11-09 12:56:30 -08:00

..

config

…

java

Merge "If the image wallpaper fails to load, including via an OutOfMemoryError because of a big bitmap, reset to the default."

2010-11-09 12:27:07 -08:00

jni

am cc798d96: am 2e2983c6: Merge "Reduce log clutter." into gingerbread

2010-11-09 07:06:02 -08:00

res

fix the build. more string disambiguaiton.

2010-11-09 12:54:32 -08:00

tests

Merge "Test to demonstrate that HTTP cookie hostnames aren't case-sensitive."

2010-11-09 10:25:04 -08:00