tree 7b2c734542f8a10ed41c7eb5665a5041ace75e2f
parent efb56b1f41f4330a2087596926b1ba9c08753b34
parent 8b5eef7d3ff30ec3823f73dfec63cfc54ce9935e
author The Android Automerger <android-build@android.com> 1270134460 -0700
committer The Android Automerger <android-build@android.com> 1270134460 -0700

Merge branch 'froyo' into froyo-release