OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Sep 2010 21:52:12 +0000 (14:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Sep 2010 21:52:12 +0000 (14:52 -0700)
Change-Id: I2c05f25df603002fca6fb827893d76799c0fb3dd


Trivial merge