943c8e7de6
Merge commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba' into eclair-plus-aosp * commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba': Update from API review.