tree 8569229c3ad33d798eea3a4c4bb575ffb728d3f1
parent 4a3b5bdc7f3261d046c01685c90f752b628b1dcc
parent 7c1f995b7bf171a1b556dcaa4dc16cf46db853be
author Christopher Tate <ctate@google.com> 1418764525 +0000
committer android-build-merger <android-build-merger@google.com> 1418764525 +0000

am 892e65cb: am 0dab4dc0: Fix bad alarm delivery
automerge: 7c1f995

* commit '7c1f995b7bf171a1b556dcaa4dc16cf46db853be':
  Fix bad alarm delivery