OSDN Git Service

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


Trivial merge