Merge commit '3530ef81d13e243bb568b8d33327f5fdda8a5b1a' into eclair-plus-aosp * commit '3530ef81d13e243bb568b8d33327f5fdda8a5b1a': android-2.1_r1 snapshot