OSDN Git Service

am a5ba0a78: am 767eb427: Merge change If990cab0 into eclair
authorChristopher Tate <ctate@android.com>
Wed, 9 Dec 2009 23:52:43 +0000 (15:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Dec 2009 23:52:43 +0000 (15:52 -0800)
Merge commit 'a5ba0a78811fcd5d3470bfa09df3e0106b77567e' into eclair-mr2-plus-aosp

* commit 'a5ba0a78811fcd5d3470bfa09df3e0106b77567e':
  Make sure to acknowledge stale broadcasts


Trivial merge