OSDN Git Service

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


Trivial merge