OSDN Git Service

Merge "Add NetworkSecurityConfigProvider" am: d1c469e876
authorChad Brubaker <cbrubaker@google.com>
Wed, 11 Nov 2015 20:39:35 +0000 (20:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Nov 2015 20:39:35 +0000 (20:39 +0000)
commit70b2eede18476f3a7d6344ffdc18b40f07bf4b5f
tree9fd3bef5da18698c57d3449f5e612ad14656ec3e
parentf12ffe6d762f281cbda56322be83a1da80b707ea
parent8c89f4d28c927ffe81c6e46159d0e5d3a0dd2986
Merge "Add NetworkSecurityConfigProvider" am: d1c469e876
am: 8c89f4d28c

* commit '8c89f4d28c927ffe81c6e46159d0e5d3a0dd2986':
  Add NetworkSecurityConfigProvider