tree 3421b9f8aee5a6361bdbf0a3df770985ba16b6f0
parent 51c5759025c190fe4496730d8c9e78d9ee77aacb
parent ca46c05b2dd8a0081d0a8b384f4fe3bcd215c9db
author The Android Automerger <android-build@android.com> 1260464508 -0800
committer The Android Automerger <android-build@android.com> 1260464508 -0800

Merge branch 'eclair' into eclair-release