OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 17:48:45 +0000 (10:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 17:48:45 +0000 (10:48 -0700)
Change-Id: Id84ff747889d6f2c15c0510263e32fdfdd18dbed


Trivial merge