am 112c980a: am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2

Merge commit '112c980a3d3fd8873dbc44006436aff80535808e'

* commit '112c980a3d3fd8873dbc44006436aff80535808e':
  Implement API to have new broadcasts replace existing broadcasts.
tree: f0128d3ea37ae97b0a76421c655ce164acacb892
  1. core/
  2. services/