OSDN Git Service

Merge "Use a builder for NetworkSecurityConfig" am: 7e98f2e697
authorChad Brubaker <cbrubaker@google.com>
Fri, 6 Nov 2015 20:31:02 +0000 (20:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Nov 2015 20:31:02 +0000 (20:31 +0000)
commit54b4b8fdfc336b8a4902637e622c3ede879edcde
treedf98378b72c45dca28e98bc845248470c4ecd7c1
parent8d19637651d03fee04ad2b0e56d5a5502ab0c23e
parent478fad3cf53874f9cc96169cd25b29b9c031637a
Merge "Use a builder for NetworkSecurityConfig" am: 7e98f2e697
am: 478fad3cf5

* commit '478fad3cf53874f9cc96169cd25b29b9c031637a':
  Use a builder for NetworkSecurityConfig