am 3d4de660: Dismiss the desk clock if it was launched by docking.

author Daniel Sandler <dsandler@google.com>

Fri, 11 Dec 2009 07:17:14 +0000 (23:17 -0800)

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

Fri, 11 Dec 2009 07:17:14 +0000 (23:17 -0800)
author Daniel Sandler <dsandler@google.com>
Fri, 11 Dec 2009 07:17:14 +0000 (23:17 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 07:17:14 +0000 (23:17 -0800)
diff --cc AndroidManifest.xml
Simple merge
diff --cc src/com/android/deskclock/DeskClock.java
Simple merge
author	Daniel Sandler <dsandler@google.com>
	Fri, 11 Dec 2009 07:17:14 +0000 (23:17 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 11 Dec 2009 07:17:14 +0000 (23:17 -0800)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/deskclock/DeskClock.java	patch \|	diff1 \|	diff2 \|	blob \| history