tree ba5b191b3af5ae8235fa9ab2eb4b754804771238
parent 28c3c5450e0588b628240af910bb25f6dbfc0fd0
parent 795604bb733d5e5aafe26946124cc56235e894f5
author Paul Jensen <pauljensen@google.com> 1432127889 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432127889 +0000

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

* commit 'd3a56eda9d3d4320721c8fe8c50c247e895a63a7':
  Undeprecate android.net.ProxyInfo as it's still used.