Merge commit 'e899caf8cce1d1a20121f19a99899553ae2b327e' into gingerbread-plus-aosp * commit 'e899caf8cce1d1a20121f19a99899553ae2b327e': Fixed api/current.xml after a bad merge.
Merge commit 'e899caf8cce1d1a20121f19a99899553ae2b327e' into gingerbread-plus-aosp * commit 'e899caf8cce1d1a20121f19a99899553ae2b327e': Fixed api/current.xml after a bad merge.