Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next...
Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev am: c2ec3f1b
am: f6170861
* commit 'f6170861':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.