tree cf23c56961be335e7d690309bda9c05cc74a6804
parent a660e48ea7c6423473d7ddaf5e7027c833366971
parent 8625adde230758d1729627d9e69c0c5a44fb8bd9
author Android Git Automerger <android-git-automerger@android.com> 1260866685 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260866685 -0800

Merge commit 'goog/eclair-plus-aosp'