tree 65c0c11ee269d7dde209546e03043376a7dd9782
parent cb9a21bcd665f182e65486bd842d0675d1baf6c4
parent 9d17f038500ebb7c7cf0e337f198e8b43bf42e4c
author The Android Automerger <android-build@android.com> 1264104177 -0800
committer The Android Automerger <android-build@android.com> 1264104177 -0800

Merge branch 'eclair' into eclair-release