reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:37 +0000 (08:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:09:37 +0000 (08:09 -0800)

Trivial merge