Merge commit '3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp * commit '3f4639a6611222ae1ae5493de49213250d292139': Update API and javadoc according to API review.
Merge commit '3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp * commit '3f4639a6611222ae1ae5493de49213250d292139': Update API and javadoc according to API review.