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)
Merge commit '372cbb5437b209f6d909ea247080da6a48c3a590' into eclair

* commit '372cbb5437b209f6d909ea247080da6a48c3a590':
  Do not merge.


Trivial merge