OSDN Git Service

am 488a80a7: Merge change Id587a517 into eclair
authorMichael Chan <mchan@android.com>
Thu, 10 Dec 2009 01:47:17 +0000 (17:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Dec 2009 01:47:17 +0000 (17:47 -0800)
commited2ebf509bdd572742091a2be1ae08a4addbb1ec
tree63116cd77a13babb7f397c5435aa96135ca1fbde
parent832bc8ee41298264122f9cb63f7f714601303d7f
parent488a80a7b111f5906bf51101785a95a6c640d265
am 488a80a7: Merge change Id587a517 into eclair

Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-plus-aosp

* commit '488a80a7b111f5906bf51101785a95a6c640d265':
  b/2314560 Prevent PIN dialog from showing up on undocked docks