OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Nov 2010 23:43:19 +0000 (15:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Nov 2010 23:43:19 +0000 (15:43 -0800)
Change-Id: Ic0f26cdf72551a108fee8877263346a8c91eab96


Trivial merge