tree ca956959ae7a18a46d0e3c1775e4dbf8c88780ff
parent 01630380b9836b355a656569cc65a836a43bf8e0
parent af5b4cb27709e2e3d6c419e81ac87363e701ce5d
author The Android Automerger <android-build@android.com> 1260377434 -0800
committer The Android Automerger <android-build@android.com> 1260377434 -0800

Merge branch 'eclair' into eclair-release