Merge
Android Code Review [Mon, 9 Feb 2009 17:57:58 +0000 (09:57 -0800)]

Trivial merge