tree dc94d06dfc70f77bc904f88060c7ae06ec1f9b35
parent 87985ae6de00f4001f957d7a27004843872a7e2a
parent 0bd445b974292dc3910b6bb85dcee7e7c378968f
author Michael Chan <mchan@android.com> 1259901885 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259901885 -0800

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

Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-mr2

* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
  b/2296110 New Dialog which appears when phone is place on dock.