tree f00fff933c35f8b06af358916d9d17c7b1e35dc7
parent ad5512b7e7ff0668203a4e891d5aa9f76424ea3a
parent 767eb427fa8eca6c842c629cd4bfbf3551692148
author Christopher Tate <ctate@android.com> 1260310292 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260310292 -0800

am 767eb427: Merge change If990cab0 into eclair

Merge commit '767eb427fa8eca6c842c629cd4bfbf3551692148' into eclair-plus-aosp

* commit '767eb427fa8eca6c842c629cd4bfbf3551692148':
  Make sure to acknowledge stale broadcasts