OSDN Git Service

am 5fdf6a91: am 5b2151ae: Do not turn off screen immediately after undocking.
authorMike Lockwood <lockwood@android.com>
Thu, 21 Jan 2010 22:29:32 +0000 (14:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Jan 2010 22:29:32 +0000 (14:29 -0800)
commit8ce3b810dcd1a40a599dd7ff5de8aea0e9758d52
tree025c24b4e8fba6ec5321ab86150ff527c4e71f95
parentb125cb8b4d0ad1e96edc49929c061dd6b689d662
parent5fdf6a917c563df953c5215fe00b6ae8fe70a501
am 5fdf6a91: am 5b2151ae: Do not turn off screen immediately after undocking.

Merge commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501'

* commit '5fdf6a917c563df953c5215fe00b6ae8fe70a501':
  Do not turn off screen immediately after undocking.
phone/com/android/internal/policy/impl/PhoneWindowManager.java