OSDN Git Service

am 372cbb54: (-s ours) Do not merge. Wake the screen before launching the AlarmAlert.
authorPatrick Scott <phanna@android.com>
Wed, 19 Aug 2009 18:12:27 +0000 (11:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Aug 2009 18:12:27 +0000 (11:12 -0700)
commit4b7cc175917adc2ac20ecf5a63efad3273bc2059
tree4ad3dfa671167722e0b5b90e772631c8018fb4e3
parentb091e88a54cde92212a2e002931cd8661ee712e3
parent372cbb5437b209f6d909ea247080da6a48c3a590
am 372cbb54: (-s ours) Do not merge. Wake the screen before launching the AlarmAlert.

Merge commit '372cbb5437b209f6d909ea247080da6a48c3a590' into eclair

* commit '372cbb5437b209f6d909ea247080da6a48c3a590':
  Do not merge.