Files
android_packages_modules_Co…/tests
Brian Muramatsu 636c31ade5 Merge remote branch 'korg/froyo' into manualmerge
Conflicts:
	tests/tests/os/src/android/os/cts/BuildVersionTest.java
	tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java

Change-Id: I1befa31b0cce0a72a6d71760d18cae1bb97ca937
2011-02-16 14:28:49 -08:00
..