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)
Merge commit '520d66ec4145f22ecfd34581ddd52578bd39a964'

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


Trivial merge