OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Sep 2010 23:39:10 +0000 (16:39 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Sep 2010 23:39:10 +0000 (16:39 -0700)
Change-Id: Ie20ef0aec822d00c70e9bb1764002cd624b4ae38


Trivial merge