merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:24:25 +0000 (14:24 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:24:25 +0000 (14:24 -0700)
Change-Id: I950e9aca87cbb0c35099b1d53cff6378bd0f26f4


Trivial merge