tree e169ae61bb5257e7e4dd9e666c3efc829aeb131e
parent 6c24afe4b03b6ca68153e7d90497065d31bb05db
parent ff6390cda43a0333a93c6b87a8eac5484e5ba8e9
author Chris Tate <ctate@android.com> 1449710294 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1449710294 +0000

Merge "Allow direct-callback alarms for non-wakeup alarms"