Merge commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db' into eclair-plus-aosp * commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db': DO NOT MERGE
Merge commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db' into eclair-plus-aosp * commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db': DO NOT MERGE