OSDN Git Service

am a8cff2ac: (-s ours) am 327b481f: (-s ours) am 786cd12f: (-s ours) Merge "DO NOT...
authorPrashant Malani <pmalani@google.com>
Mon, 15 Jun 2015 14:30:35 +0000 (14:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Jun 2015 14:30:35 +0000 (14:30 +0000)
commit6a7fdbddf7f7cec3ce511994b05eaeb94d18da6a
tree6dac7edc69e18684cb8e71a8341bc358ab0bdc25
parent5b15bd7b2d403cedf2c76729b3a38925f52be66b
parenta8cff2acb7cc18d1cf123f45eb4e47e1ab876a20
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"