tree e380199303b5186f4f9780c57947f904fabc7278
parent 773c77904249482681e13e852a58c8446caf6bb1
parent ac2c10c2419a2fd8686f62f4e20dff19f5e8cc72
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'