Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb