OSDN Git Service

am 8305ae30: am 98948f9c: Fix a couple race conditions with expired alarms.
authorPatrick Scott <phanna@android.com>
Fri, 18 Sep 2009 20:52:16 +0000 (13:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Sep 2009 20:52:16 +0000 (13:52 -0700)
Merge commit '8305ae304fa701c6e1acd0424c2ad0de52512dbb'

* commit '8305ae304fa701c6e1acd0424c2ad0de52512dbb':
  Fix a couple race conditions with expired alarms.


Trivial merge