OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 May 2010 18:08:12 +0000 (11:08 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 May 2010 18:08:12 +0000 (11:08 -0700)
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0


Trivial merge