tree aa2765a5018347faf3d229dae5e0315d7614641d
parent 19390cc7219639e3b95c527eebc4d85e3c16d3f6
parent b9b45a5e26ed020a39a507a173d9f29e336cf989
author The Android Automerger <android-build@android.com> 1260464506 -0800
committer The Android Automerger <android-build@android.com> 1260464506 -0800

Merge branch 'eclair' into eclair-release