tree f7e599b5eb2c9c7b3fbe472dd2a7bea4f9190e6e
parent 6ffd2b28292fce8adf925ab35b9533dc35fa50df
parent 76d3d8590d1fb9a9c341159fbc06914ef19bdb8d
author Chad Brubaker <cbrubaker@google.com> 1463971099 +0000
committer android-build-merger <android-build-merger@google.com> 1463971099 +0000

Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387
am: 76d3d8590d

* commit '76d3d8590d1fb9a9c341159fbc06914ef19bdb8d':
  Use an attribute for the network security config resource

Change-Id: I15da47a2cd78dc37019bd20847d13248612c77f5