Merge commit 'bf13850bed17d994077d1e6226b6330dd960bf26' into eclair-mr2-plus-aosp * commit 'bf13850bed17d994077d1e6226b6330dd960bf26': account manager api review changes
Merge commit 'bf13850bed17d994077d1e6226b6330dd960bf26' into eclair-mr2-plus-aosp * commit 'bf13850bed17d994077d1e6226b6330dd960bf26': account manager api review changes