tree f9d624ae37090834c91218b1827e190d8d14bdd9
parent 25215285c4afb686eab90fa48f0965dcdea3564c
parent 614907365128497c74c1f61d7576bff12e108f70
author Android Git Automerger <android-git-automerger@android.com> 1260866644 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260866644 -0800

Merge commit 'goog/eclair-plus-aosp'