commit | 8d99625ab24aeaaee6d8eaafc60b96c839102d75 | [log] [tgz] |
---|---|---|
author | Chad Brubaker <cbrubaker@google.com> | Wed Dec 09 19:02:04 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Dec 09 19:02:04 2015 +0000 |
tree | 44fdaa30dcd5c30c4ed62b8e4c3f1930e9d8e240 | |
parent | 9c7292bed1407667d8c3dafb9e864b7a888aff7d [diff] | |
parent | 19aeed568a1985780717416ea1e67d046cbd077b [diff] |
Merge "Refactor NetworkSecurityPolicy to be pluggable" am: 645d13e59f am: 19aeed568a -s ours * commit '19aeed568a1985780717416ea1e67d046cbd077b': Refactor NetworkSecurityPolicy to be pluggable