DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am:...
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. am: e79c73d6 am: 4baa9012
am: c6442281 -s ours
* commit 'c6442281':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.