tree 74aaf3ef295a880e7cdcd455745286287bd59ae6
parent 57d8c4cc23046f6a44965da824acf23061088aec
parent 8eea3914a012eec703b5c7829361bbc6e356dc66
author The Android Automerger <android-build@android.com> 1260398810 -0800
committer The Android Automerger <android-build@android.com> 1260398810 -0800

Merge branch 'eclair' into eclair-release