tree ef61e45558a5819875975cde323eb29414a89097
parent 82bb06c8f774bcdebdf0fc0de953f78c3b475b11
parent a2f2c5c340b552b92088966734097845b76ea310
author Chad Brubaker <cbrubaker@google.com> 1450724461 +0000
committer android-build-merger <android-build-merger@google.com> 1450724461 +0000

Merge "Add hostname aware isCleartextTrafficPermitted"
am: a2f2c5c340

* commit 'a2f2c5c340b552b92088966734097845b76ea310':
  Add hostname aware isCleartextTrafficPermitted