OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Wed, 10 Aug 2011 22:11:56 +0000 (15:11 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Wed, 10 Aug 2011 22:11:56 +0000 (15:11 -0700)
Change-Id: Iaa8ba04a4b18c9168634aca93a47fc2dfc0a0746


Trivial merge