OSDN Git Service

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


Trivial merge