bf765b6c70
Merge commit '411400980720895c4195c71e181831bc771a5a7b' into eclair-plus-aosp * commit '411400980720895c4195c71e181831bc771a5a7b': API_CHANGE