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.