From: Dirk Dougherty <ddougherty@google.com>
Date: Fri, 20 Nov 2009 21:13:25 +0000 (-0800)
Subject: am 055b4392: Merge change I0a17a960 into eclair
X-Git-Tag: android-x86-4.4-r1~16590^2~4^2~258
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1ac40cdfdcd2a548748309df2ae1b8c41adcc495;p=android-x86%2Fframeworks-native.git

am 055b4392: Merge change I0a17a960 into eclair

Merge commit '055b439289f38c5a1d3bd43c0e218a4cbb93773d' into eclair-mr2

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

1ac40cdfdcd2a548748309df2ae1b8c41adcc495