am 5ef6b7e3: am d806ebb7: am 67c838de: Merge "Replace String host:port/url args with Uri arg" into mnc-dev

* commit '5ef6b7e30a26d3b929fd8f9fd690fac5d917dce5':
  Replace String host:port/url args with Uri arg
tree: b7c48fb072963c06fc7565e33aa15f0fd592fbd5
  1. res/
  2. src/
  3. support/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml