tree e1a538a71fdcf58bf4a3b3c6b32b516562f2ffd5
parent 714c3f5b38d19c517b93cc030f9866278960ea7a
parent 0086ab50631cfc6abb0f591871f5bb5da74e4606
author The Android Automerger <android-build@android.com> 1259083745 -0800
committer The Android Automerger <android-build@android.com> 1259083745 -0800

Merge branch 'eclair' into eclair-release