Merge branch 'cupcake'
authorandroid-build SharedAccount <android-build@undroid16.corp.google.com>
Fri, 16 Jan 2009 00:16:09 +0000 (16:16 -0800)
committerandroid-build SharedAccount <android-build@undroid16.corp.google.com>
Fri, 16 Jan 2009 00:16:09 +0000 (16:16 -0800)
commit326eef4b7f89ca56a86493ddc756f98c67ffe863
treeb096110bb60d5e19c4882d136ca5424215bbe4f4
parent9800ba05b00c99e8c5280fbcd120c8774880de8f
parentfd424fc29ada110a264cb79bc950414b97188354
Merge branch 'cupcake'