tree dd0fe87e38f105595661ba6ffb690bb6790c512f
parent 74292a343e741af4b844b87fc0099532e59b9be0
parent f2826c7e2131ad9d81810b4bd7e3f0b120bbc97c
author The Android Automerger <android-build@android.com> 1258130348 -0800
committer The Android Automerger <android-build@android.com> 1258130348 -0800

Merge branch 'eclair' into eclair-release