am fb9612ba: (-s ours) am 04d2cc05: Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread

* commit 'fb9612ba98f29b794244323cab6f56204d072eeb':
  Do not merge: Doc change: API diff report for gingerbread.