OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Jun 2010 20:14:16 +0000 (13:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Jun 2010 20:14:30 +0000 (13:14 -0700)
Change-Id: I2169fb30a5bfe48501745b2141e82ad9e25971aa


Trivial merge