tree 828823ae07c28e70b629822a6603a09f6f311b4a
parent 0e954dccabc4b3d7247c6469864bf20d059e02b9
parent 012de64e2dade079979bfa6cdca323b36901a0e6
author Christopher Tate <ctate@android.com> 1418423867 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418423867 +0000

am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"

* commit '012de64e2dade079979bfa6cdca323b36901a0e6':
  Fix bugs regarding delay the dispatching of non-wakeup alarms