Merge commit 'aadc9220bd04ba8dd016fe634fabf6c91a1ce672' into eclair-plus-aosp * commit 'aadc9220bd04ba8dd016fe634fabf6c91a1ce672': API_CHANGE
Merge commit 'aadc9220bd04ba8dd016fe634fabf6c91a1ce672' into eclair-plus-aosp * commit 'aadc9220bd04ba8dd016fe634fabf6c91a1ce672': API_CHANGE