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.
tree: ba5b191b3af5ae8235fa9ab2eb4b754804771238
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py