OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Dec 2010 00:06:47 +0000 (16:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Dec 2010 00:06:47 +0000 (16:06 -0800)
Change-Id: Ifea6128a9dc6899797611782e79f549ee8b0edd7


Trivial merge