OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Aug 2010 22:07:06 +0000 (15:07 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Aug 2010 22:07:06 +0000 (15:07 -0700)
Change-Id: Ib2fbc41481934a38090dd1ee97d7ddec30ca8df1


Trivial merge