OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:28:32 +0000 (07:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:28:32 +0000 (07:28 -0700)
Change-Id: I6e4280a7f664c84bdd5205db642ed0ae63bc5e3b


Trivial merge