Merge "Clarify documentation for getActiveNetworkInfo and friends" am: b1016fbf14
am: bc4e495705

Change-Id: I339bb71182723907ed078e8be739c4d4ea2d1da5
tree: e58ce9362c05ef21293bebe79ba3cc4c2ff235c1
  1. core/
  2. services/
  3. tests/