tree d64bef1cc96a06f24b513bea8c55fac5a854fc80
parent 5af5dd348c0139f7699e7deae311864422dd53e3
parent b99dd716b4af0afde074e28b50b7b28ae3c03da7
author The Android Automerger <android-build@android.com> 1263936100 -0800
committer The Android Automerger <android-build@android.com> 1263936100 -0800

Merge branch 'eclair' into eclair-release