tree 6d496e5df6d888c030cda8b85ffa56a79539f8a4
parent 1b6ba62e11d995c530b29563c398bd0fb5405ec1
parent ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8
author The Android Automerger <android-build@android.com> 1259947444 -0800
committer The Android Automerger <android-build@android.com> 1259947444 -0800

Merge branch 'eclair' into eclair-release