am 663c39d4: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:22:15 +0000 (08:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:22:15 +0000 (08:22 -0800)
commit2cbe35e5b24ecbdbd114248b1fb8010926d80567
tree00f298e7a2c5d5f9fac045342cf88007b7338dfe
parentc66f7d2ff87d3276d2a369bb8b88a617b544203a
parent663c39d4fd672cd52ca852d0717bfec955ebfa98
am 663c39d4: reconcile main tree with open-source eclair

Merge commit '663c39d4fd672cd52ca852d0717bfec955ebfa98' into eclair-plus-aosp

* commit '663c39d4fd672cd52ca852d0717bfec955ebfa98':
  android-2.1_r1 snapshot