OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 25 Aug 2010 22:56:41 +0000 (15:56 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 25 Aug 2010 22:56:41 +0000 (15:56 -0700)
Change-Id: I734d1d07fbf4b9e58b384e32dcfac72cb5bd0cfb


Trivial merge