OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jan 2010 19:21:28 +0000 (11:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jan 2010 19:21:28 +0000 (11:21 -0800)

Trivial merge