tree d69961fd31e5b67b70b32242b30b90ff3ee5dcad
parent 4487660fd141a086ef54f2080a2f28f960af42ca
parent 247226b1d57dfc6571bdb7c83787e63f7409f2ab
author The Android Automerger <android-build@android.com> 1258654992 -0800
committer The Android Automerger <android-build@android.com> 1258654992 -0800

Merge branch 'eclair' into eclair-release