OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Nov 2010 21:46:29 +0000 (13:46 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Nov 2010 21:46:29 +0000 (13:46 -0800)
Change-Id: Ie8820121c32589443f5d53099de2f04f4753d9f7


Trivial merge