OSDN Git Service

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


Trivial merge