tree 25e2aca9eeb75fe09908731aac3642fa1b3e3e9c
parent e2a508d53109890e021e53e6ed19cc4fee5528b1
parent 257dd9f215155776ce2abd158d9fba7bdafdc6f8
author The Android Automerger <android-build@android.com> 1258146778 -0800
committer The Android Automerger <android-build@android.com> 1258146778 -0800

Merge branch 'eclair' into eclair-release