OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 21:48:24 +0000 (13:48 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 21:48:24 +0000 (13:48 -0800)

Trivial merge