tree 6dac7edc69e18684cb8e71a8341bc358ab0bdc25
parent 5b15bd7b2d403cedf2c76729b3a38925f52be66b
parent a8cff2acb7cc18d1cf123f45eb4e47e1ab876a20
author Prashant Malani <pmalani@google.com> 1434378635 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434378635 +0000

am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev

* commit 'a8cff2acb7cc18d1cf123f45eb4e47e1ab876a20':
  DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"