Merge "Remove Broken ListActivityTest" into gingerbread