tree 0edbc030ec09bdb9438b94b92bead9a0ab665926
parent 526891c2145e65d91256c7a1aebd21c78d8b2a07
parent 6799f0f9ced102e84475b5af3dbca16c0e6f2280
author The Android Automerger <android-build@android.com> 1260464507 -0800
committer The Android Automerger <android-build@android.com> 1260464507 -0800

Merge branch 'eclair' into eclair-release