OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 16:03:32 +0000 (09:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 16:03:32 +0000 (09:03 -0700)
Change-Id: I058f809f7e7eb69a757cb75f934a3630dfd7d777


Trivial merge