OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 May 2010 22:57:42 +0000 (15:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 May 2010 22:57:42 +0000 (15:57 -0700)
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da


Trivial merge