OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 15:41:59 +0000 (08:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 15:41:59 +0000 (08:41 -0700)
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6


Trivial merge