am 0bd445b9: b/2296110 New Dialog which appears when phone is place on dock.

author Michael Chan <mchan@android.com>

Fri, 4 Dec 2009 04:44:50 +0000 (20:44 -0800)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 4 Dec 2009 04:44:50 +0000 (20:44 -0800)
author Michael Chan <mchan@android.com>
Fri, 4 Dec 2009 04:44:50 +0000 (20:44 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 04:44:50 +0000 (20:44 -0800)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Michael Chan <mchan@android.com>
	Fri, 4 Dec 2009 04:44:50 +0000 (20:44 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 4 Dec 2009 04:44:50 +0000 (20:44 -0800)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history