OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 8 Oct 2010 22:54:35 +0000 (15:54 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 8 Oct 2010 22:54:35 +0000 (15:54 -0700)
Change-Id: I512ca46b9579f24774b1a56f8d5531a150d090b6


Trivial merge