tree d589f4bbe687bac8506b0eedb537ca268c567ec0
parent 3108f413caf73990ee1a4b8297c3d3d93e6ba8f5
parent d0b7a8cf2b26afe598799d4a451a985f0da45c2d
author The Android Automerger <android-build@android.com> 1274134748 -0700
committer The Android Automerger <android-build@android.com> 1274134748 -0700

Merge branch 'froyo' into froyo-release