OSDN Git Service

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


Trivial merge