tree 706129370549ecef3b1c15556bd01ade3b3b2c64
parent dde15b8c081ff35470a3fda33d856faee124f10c
parent 68b4182d77ede5c50257f5b3bff8e1e4e5a9dd9c
author The Android Automerger <android-build@android.com> 1273122697 -0700
committer The Android Automerger <android-build@android.com> 1273122697 -0700

Merge branch 'froyo' into froyo-release