tree e873a09d0a5136d5868883cb515be663dc340315
parent fba0c6ffe5b5ad69fb5ac74191c44e6a957c152c
parent 4d55cb369de5933025af40bece5e08830aae935e
author The Android Automerger <android-build@android.com> 1258390510 -0800
committer The Android Automerger <android-build@android.com> 1258390510 -0800

Merge branch 'eclair' into eclair-release