am e4034f0e: am 5b7c883d: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:13:05 +0000 (14:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:13:05 +0000 (14:13 -0800)
commitf35837d93b6de994551e71672ad65405b2972adf
tree242917d13f3614f94d07a4de2265c4a21660e269
parent4dd03683cf5c405c49ebf76181d82c293bae4864
parente4034f0e42fff82a84c8ad3321c80a96f3b9afab
am e4034f0e: am 5b7c883d: reconcile main tree with open-source eclair

Merge commit 'e4034f0e42fff82a84c8ad3321c80a96f3b9afab'

* commit 'e4034f0e42fff82a84c8ad3321c80a96f3b9afab':
  android-2.1_r1 snapshot