tree a75a890cc14f302237f6d60694cfcf8c7814ac11
parent 228fd8d1152ff844f04f0bd2f1ec3f9ba42d39da
parent 9b0ad4c7258b586f1763bc497e8ed33f42ce446e
author The Android Automerger <android-build@android.com> 1260290925 -0800
committer The Android Automerger <android-build@android.com> 1260290925 -0800

Merge branch 'eclair' into eclair-release