am 520d66ec: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:15:43 +0000 (14:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:15:43 +0000 (14:15 -0800)
commit4448a571a2ac62748e5216a0b8dd5b862df65a39
tree821e85f815701645ade333b7ca04e3477c6fd6eb
parentc88d03b5156108c92abc3d527d600b7c393fd7c7
parent520d66ec4145f22ecfd34581ddd52578bd39a964
am 520d66ec: reconcile main tree with open-source eclair

Merge commit '520d66ec4145f22ecfd34581ddd52578bd39a964'

* commit '520d66ec4145f22ecfd34581ddd52578bd39a964':
  android-2.1_r1 snapshot