tree f30e44a31e78a43f4d9f84e349c54518849bb363
parent dace6e60a15699e58e31fa5cd286b22124fe34ea
parent 8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f
author The Android Automerger <android-build@android.com> 1257524382 -0800
committer The Android Automerger <android-build@android.com> 1257524382 -0800

Merge branch 'eclair' into eclair-release