Merge branch 'cupcake'
authorandroid-build SharedAccount <android-build@undroid16.corp.google.com>
Fri, 16 Jan 2009 00:16:05 +0000 (16:16 -0800)
committerandroid-build SharedAccount <android-build@undroid16.corp.google.com>
Fri, 16 Jan 2009 00:16:05 +0000 (16:16 -0800)
commit7739d182c0b5b2a2a74ed3ab04479d58fc1975e4
treedb611eab4bfb11527a502c07a22f4f736a4075ec
parentadfd7d1c2b74954f735f507817d75ab989cfdd54
parent9b427072dbcb8896b8670bc414dd0c3002eb9b1f
Merge branch 'cupcake'