tree edfbfa97b18c7bd04581ba1763d562e285600c69
parent c4eff24360e5c6ab90fcdef84596887a4c120995
parent f0be2134e577048c932c5810a7f8a30876bff665
author The Android Automerger <android-build@android.com> 1259599166 -0800
committer The Android Automerger <android-build@android.com> 1259599166 -0800

Merge branch 'eclair' into eclair-release