am ea6cc9a6: Merge "Switch from switch to if-else to be compatible with the...
am ea6cc9a6: Merge "Switch from switch to if-else to be compatible with the new ADT" into ics-ub-calendar-aqua
* commit 'ea6cc9a6':
Switch from switch to if-else to be compatible with the new ADT