tree 0d71be143a13f28587a96cf4ec62a39293223815
parent 278d960aae1b2f0b8a3fa0c8056ba4aded96b133
parent caa17a905a6f73eefbcd913e5c5cab4090f4820b
author Android Git Automerger <android-git-automerger@android.com> 1260866645 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260866645 -0800

Merge commit 'goog/eclair-plus-aosp'