Merge "Replace String host:port/url args with Uri arg" into mnc-dev
tree: b7c48fb072963c06fc7565e33aa15f0fd592fbd5
  1. res/
  2. src/
  3. support/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml