am 5b7c883d: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:40:59 +0000 (08:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:40:59 +0000 (08:40 -0800)
commite4034f0e42fff82a84c8ad3321c80a96f3b9afab
tree242917d13f3614f94d07a4de2265c4a21660e269
parentc485e4b98e33a71ff56c120a52f10b1719ecbe1c
parent5b7c883da6527a411236592dd450893260485621
am 5b7c883d: reconcile main tree with open-source eclair

Merge commit '5b7c883da6527a411236592dd450893260485621' into eclair-plus-aosp

* commit '5b7c883da6527a411236592dd450893260485621':
  android-2.1_r1 snapshot