OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 28 Oct 2010 00:56:17 +0000 (17:56 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 28 Oct 2010 00:56:17 +0000 (17:56 -0700)
Change-Id: Idbf7fa0ee3390b06640fa39dbda3bca91ea327c8


Trivial merge