Merge commit '88457c5c5d4abdf0f99f19612db5d29c1f45ffa1' * commit '88457c5c5d4abdf0f99f19612db5d29c1f45ffa1': android-2.1_r1 snapshot