Merge branch 'cupcake'
The Android Open Source Project [Tue, 20 Jan 2009 22:05:35 +0000 (14:05 -0800)]

Trivial merge