tree 6bf953b2264ce9bee701391b2fc869ba8fb8b0fa
parent 59fb3ee3bd5cfb562183fc92ae1f46fbbb4ef8ce
parent a3c15ab7e394da8ff0ef3b671195583d32b4435d
author Dianne Hackborn <hackbod@google.com> 1260836103 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260836103 -0800

am 83652ebf: am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2

Merge commit '83652ebfe1963bcecdcf24383165904223baca6e'

* commit '83652ebfe1963bcecdcf24383165904223baca6e':
  Implement API to have new broadcasts replace existing broadcasts.