Michael Chan 20b0ae927e am 488a80a7: Merge change Id587a517 into eclair ...

Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-mr2

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

2009-12-10 17:41:23 -08:00

..

android/settings

am 488a80a7: Merge change Id587a517 into eclair

2009-12-10 17:41:23 -08:00