Merge "Support renaming for ProxyProperties to ProxyInfo"
tree: a68d2fcd402b9010b385136e3da1c37a1ffbc250
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml