Merge branch 'open_source_no_contributions' into google_internal
The Android Open Source Project [Sun, 29 Mar 2009 15:55:05 +0000 (08:55 -0700)]

Trivial merge