Merge "Updated assets from Gingerbread" into honeycomb