Merge commit '21b8dbe5c4f657f673bae2b1ad298f91465616d2' into eclair-mr2-plus-aosp * commit '21b8dbe5c4f657f673bae2b1ad298f91465616d2': Track library changes
Merge commit '21b8dbe5c4f657f673bae2b1ad298f91465616d2' into eclair-mr2-plus-aosp * commit '21b8dbe5c4f657f673bae2b1ad298f91465616d2': Track library changes