Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread