OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 18 Nov 2010 00:22:02 +0000 (16:22 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 18 Nov 2010 00:22:02 +0000 (16:22 -0800)
Change-Id: Idc0001767c65246da61f91696675373a16e81c79


Trivial merge