automerge: dedd42a
* commit 'dedd42a2bdfafd6195d793949766d1c53f80ae51':
Rename EXTRA_NETWORK ConnectivityManager constants.
automerge: dedd42a
* commit 'dedd42a2bdfafd6195d793949766d1c53f80ae51':
Rename EXTRA_NETWORK ConnectivityManager constants.