OSDN Git Service

Merge (ignore) from eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jan 2010 21:02:55 +0000 (13:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 21 Jan 2010 21:03:14 +0000 (13:03 -0800)

Trivial merge