am 5ff9d88c: (-s ours) am 598d143a: am 88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev
* commit '5ff9d88c':
DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.