Merge commit '1fb2a6cd4c27847f8de8369b497f37d3d47c622f' into eclair-plus-aosp * commit '1fb2a6cd4c27847f8de8369b497f37d3d47c622f': android-2.1_r1 snapshot