tree d208181c7ceaa950e56f5ba417648980ffad5849
parent 556d3504cb726e8e04e6f2aa92dd6eb7f6d18c4f
parent 8eac64e5b2723d074f20f80429e51abe0818dfe4
author Brian Muramatsu <btmura@android.com> 1298946314 -0800
committer Brian Muramatsu <btmura@android.com> 1298946314 -0800

Merge remote branch 'korg/froyo' into froyomerge

Conflicts:
	tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
	tests/tests/view/src/android/view/cts/WindowTest.java

Change-Id: Ibf7651011e4e594d0173c90f6341f75a9e71d45b