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"
This commit is contained in: