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

Trivial merge