Merge branch 'cupcake'
The Android Open Source Project [Sat, 10 Jan 2009 02:04:23 +0000 (18:04 -0800)]

Trivial merge