am 886ab256: am cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s...
am 886ab256: am cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev
* commit '886ab256':
Undeprecate android.net.ProxyInfo as it's still used.