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

Merge commit '8c48b4a532b1011a2f76f3565335c77fc5b141b3'

* commit '8c48b4a532b1011a2f76f3565335c77fc5b141b3':
  Add bugreport info about network feature use. DO NOT MERGE