am 2b17d4bf: (-s ours) am 1a337547: Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair

Merge commit '2b17d4bf67be078e262fd5104277f6ffe725ca5d'

* commit '2b17d4bf67be078e262fd5104277f6ffe725ca5d':
  Add bugreport info about network feature use. DO NOT MERGE
tree: c894f113085cb8efb272033f32a1f7fcfbc7851e
  1. core/
  2. services/