tree ab4f0037bf38abe3dc9693345df1452504a17eeb
parent d28d4bcf9b6c9d8142fbed995250d41a59387c72
parent 0cb8f014105b9e8e3bdb12cf091ef61e8c575333
author Chad Brubaker <cbrubaker@google.com> 1446934900 +0000
committer android-build-merger <android-build-merger@google.com> 1446934900 +0000

Merge "Add xml source for network security configuration" am: ead46ecc84
am: 0cb8f01410

* commit '0cb8f014105b9e8e3bdb12cf091ef61e8c575333':
  Add xml source for network security configuration