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

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