merger "ics-tracking" into gingerbread