OSDN Git Service

am 3d4de660: Dismiss the desk clock if it was launched by docking.
authorDaniel Sandler <dsandler@google.com>
Fri, 11 Dec 2009 07:17:14 +0000 (23:17 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 07:17:14 +0000 (23:17 -0800)
commite5b7da9308d17c4d6720c012950c7922779435f7
tree14c490bb2ba9c0bdf97472e7e19015823656abfa
parent23a305607e907ae0b6644393330420f31867c512
parent3d4de660d654fee760cf96f609198489e4d6525d
am 3d4de660: Dismiss the desk clock if it was launched by docking.

Merge commit '3d4de660d654fee760cf96f609198489e4d6525d' into eclair-mr2

* commit '3d4de660d654fee760cf96f609198489e4d6525d':
  Dismiss the desk clock if it was launched by docking.
AndroidManifest.xml
src/com/android/deskclock/DeskClock.java