tree 35c1246ec1e68ab5c05a1ba8b94d8f1f8ff8dd99
parent 34aeeb0f956357fedbe16fbb0fd1172c9bdfaa1a
parent daa5302aae95d178cc4204d545392c32ce4d0ca8
author The Android Automerger <android-build@android.com> 1260464483 -0800
committer The Android Automerger <android-build@android.com> 1260464483 -0800

Merge branch 'eclair' into eclair-release