tree e70f92b02e712520a106a689d3a46ce2f08ca911
parent 1800fe985a27f7e2ed3c9fda9fc8ae3042901c0b
parent 769ed21c33c3629411eb3bbf924de45737a18067
author The Android Automerger <android-build@android.com> 1264642814 -0800
committer The Android Automerger <android-build@android.com> 1264642814 -0800

Merge branch 'eclair' into eclair-release