tree 22f4beb024155451690cd6c8d00f53e22621f5bb
parent d9e30a1c9d97af9b9ea28fe20daf39a94d985914
parent dbf9d6b4c090b632e0f6608de8d01e7508435bdd
author Brian Muramatsu <btmura@android.com> 1298943224 -0800
committer Brian Muramatsu <btmura@android.com> 1298944211 -0800

Merge remote branch 'korg/eclair' into eclairmerge

Conflicts:
	tests/AndroidManifest.xml
	tests/jni/Android.mk
	tests/res/layout/focus_finder_layout.xml
	tests/res/values/strings.xml
	tests/src/android/opengl/cts/OpenGlEsVersionStubActivity.java
	tests/src/android/os/cts/CpuFeatures.java
	tests/src/android/view/cts/FocusFinderStubActivity.java
	tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
	tests/tests/os/src/android/os/cts/BuildTest.java
	tests/tests/permission/src/android/permission/cts/DebuggableTest.java
	tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
	tools/host/src/com/android/cts/TestDevice.java
	tools/host/src/com/android/cts/TestSessionLog.java
	tools/host/src/com/android/cts/Version.java
	tools/host/src/res/cts_result.xsl

Change-Id: If7cd43b18be79a062d23d5536a3ff3a91c635f0b