OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Feb 2010 18:02:33 +0000 (10:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Feb 2010 18:02:33 +0000 (10:02 -0800)

Trivial merge