2dfaa698
Merge commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80' into eclair-plus-aosp * commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80': do not merge