OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 5 Sep 2010 22:32:31 +0000 (15:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 5 Sep 2010 22:32:31 +0000 (15:32 -0700)
Change-Id: I05ef47a783f84d9ca1673b65f69ed51c1b8dec35


Trivial merge