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

Change-Id: If1d1ff69a6f3e80796d68ec5dbfa722adce23d40
1 file changed