OSDN Git Service

Merge "Add hostname aware isCleartextTrafficPermitted" am: a2f2c5c340
authorChad Brubaker <cbrubaker@google.com>
Mon, 21 Dec 2015 19:05:01 +0000 (19:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Dec 2015 19:05:01 +0000 (19:05 +0000)
commit3d27be827b5146b4c9bc0dd0747c0f41c036fe3d
tree64fea15ebce9f13fd9c3f281c39fcca688517ea7
parent5fa4d15d27d1a4610c0202b5ce89e41a13aa331f
parentc642e052f095d42882f46c2667d609136e269069
Merge "Add hostname aware isCleartextTrafficPermitted" am: a2f2c5c340
am: c642e052f0

* commit 'c642e052f095d42882f46c2667d609136e269069':
  Add hostname aware isCleartextTrafficPermitted