Merge commit 'f3971747506ca9055e7b5c42a809ac12f8c26ad3' into eclair-mr2-plus-aosp * commit 'f3971747506ca9055e7b5c42a809ac12f8c26ad3': update account manager javadoc
Merge commit 'f3971747506ca9055e7b5c42a809ac12f8c26ad3' into eclair-mr2-plus-aosp * commit 'f3971747506ca9055e7b5c42a809ac12f8c26ad3': update account manager javadoc