Merge branch 'cupcake'
The Android Open Source Project [Thu, 22 Jan 2009 08:16:11 +0000 (00:16 -0800)]

Trivial merge