tree a1ea4d4df3534f5ae9b4a704b2940a9072a1857d
parent e7e76ca15abb12a79530ec975e99bd97e093d3a5
parent 5f9978e15a316d7618ca81a07691e0e46527783d
author The Android Automerger <android-build@android.com> 1258304731 -0800
committer The Android Automerger <android-build@android.com> 1258304731 -0800

Merge branch 'eclair' into eclair-release