Merge branch 'cupcake'
android-build SharedAccount [Fri, 16 Jan 2009 00:16:09 +0000 (16:16 -0800)]

Trivial merge