am 4b0b6095: Merge branch \'eclair-plus-aosp\' of...

am 4b0b6095: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/policies/base into eclair-mr2-plus-aosp

Merge commit '4b0b6095551bab9b9504fa581968632df9c62960'

* commit '4b0b6095551bab9b9504fa581968632df9c62960':
  More fix #2163209: alarm clock rings but is hidden behind lock screen