tree 64fea15ebce9f13fd9c3f281c39fcca688517ea7
parent 5fa4d15d27d1a4610c0202b5ce89e41a13aa331f
parent c642e052f095d42882f46c2667d609136e269069
author Chad Brubaker <cbrubaker@google.com> 1450724701 +0000
committer android-build-merger <android-build-merger@google.com> 1450724701 +0000

Merge "Add hostname aware isCleartextTrafficPermitted" am: a2f2c5c340
am: c642e052f0

* commit 'c642e052f095d42882f46c2667d609136e269069':
  Add hostname aware isCleartextTrafficPermitted