tree b9f3556e0b459980ec7cc3a4bd72b64a2d6f5079
parent 8b59cdaf2fc8edebbb868d9129ccca354ae112fb
parent 63e4f49832a7327bc315d30484379e5da6db4098
author Android Git Automerger <android-git-automerger@android.com> 1260866684 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260866684 -0800

Merge commit 'goog/eclair-plus-aosp'