tree e246b85a0971d0b03fa2bec1e06e29cfc43f2799
parent 1f921ea46799a5f85ed856d0d65665fcf2682952
parent 13724ea6078748195bcf747641bf6ee8fbbe0f4b
author The Android Automerger <android-build@android.com> 1259859600 -0800
committer The Android Automerger <android-build@android.com> 1259859600 -0800

Merge branch 'eclair' into eclair-release