OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Dec 2010 20:11:48 +0000 (12:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Dec 2010 20:11:48 +0000 (12:11 -0800)
Change-Id: Ifcf5e741779a169fce6a2f7eead9863bca927845


Trivial merge