Merge "Update the API file." into gingerbread