tree 95a2c99bcc3d6a7a51092643edadca060e0ec41e
parent 5f1a99a3ca8d6e620b98afb70332611331289717
parent 4a25f3f3e49e952616d0d47167c157904908c156
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1279863742 -0700
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1279863742 -0700

Merge commit 'goog/froyo' into froyo-release