OSDN Git Service

Merge branch 'open_source' into google_internal
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 29 Mar 2009 15:55:20 +0000 (08:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 29 Mar 2009 15:55:20 +0000 (08:55 -0700)

Trivial merge