Merge branch 'cupcake'
The Android Open Source Project [Wed, 21 Jan 2009 07:25:43 +0000 (23:25 -0800)]

Trivial merge