OSDN Git Service

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

Trivial merge