tree c69b4e3740ae0143da822aee3e99357b15347645
parent 37411b6c8251cb6e88e8e4e01eeaa067fd6e7045
parent ae4b4a66e778b557d67f34f75009200e4eec34a9
author Chad Brubaker <cbrubaker@google.com> 1449687309 +0000
committer android-build-merger <android-build-merger@google.com> 1449687309 +0000

Merge "Refactor NetworkSecurityPolicy to be pluggable"
am: ae4b4a66e7

* commit 'ae4b4a66e778b557d67f34f75009200e4eec34a9':
  Refactor NetworkSecurityPolicy to be pluggable