OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 May 2010 16:33:50 +0000 (09:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 May 2010 16:33:50 +0000 (09:33 -0700)
Change-Id: Iab9eddbfea000b9403c92a211c37b93772f2a9c7


Trivial merge