f2b3fcf5a7
Merge commit '5f7cee89ca6670cefe91192e364037ee6ce39b19' into eclair-plus-aosp * commit '5f7cee89ca6670cefe91192e364037ee6ce39b19': Add updated API diff based on 4.xml.