tree e0b6007fd80855457d7b602d38300732298f0956
parent 6d8151e32d287c7d4390d7461072196812e62c1c
parent 09cf7d19db69dc4ac0f3457590e8df539bfec7d1
author The Android Automerger <android-build@android.com> 1259083761 -0800
committer The Android Automerger <android-build@android.com> 1259083761 -0800

Merge branch 'eclair' into eclair-release