tree 3061046f4bcc31b696c4bdc0b00005acb0e80fd5
parent ea1862bbf459e5af0222d9bb49741b45ab10791a
parent b11f8a216f326a96bbdb08b470a7de8c2fa81edf
author Dirk Dougherty <ddougherty@google.com> 1258752179 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258752179 -0800

am b11f8a21: am d47fad27: am 055b4392: Merge change I0a17a960 into eclair

Merge commit 'b11f8a216f326a96bbdb08b470a7de8c2fa81edf'

* commit 'b11f8a216f326a96bbdb08b470a7de8c2fa81edf':
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.