OSDN Git Service

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


Trivial merge