tree 36189bca6eb63c2280def3217d2cffaa08be43a0
parent bb0135d1923734eee0d8078e4462310f81d0ddf9
parent 2cbf43b9b0429b4b09ed6f67abe56e20bcdf9f6a
author The Android Automerger <android-build@android.com> 1264547764 -0800
committer The Android Automerger <android-build@android.com> 1264547764 -0800

Merge branch 'eclair' into eclair-release