tree 2dfdd3d43d482e463c15f081ae247f3218470c96
parent cffb9cd4d57e092c8936b414fdbf42a31fc57b01
parent bf9d4d94411f5eee7ecebf139a301930cecbc1f3
author Android Git Automerger <android-git-automerger@android.com> 1260866705 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260866705 -0800

Merge commit 'goog/eclair-plus-aosp'