tree 5cb88b6d22a522198ad38533de8fde1755feadb5
parent 1a045584d44030947793f2a48953ce54ff2df0c6
parent ce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2
author Chad Brubaker <cbrubaker@google.com> 1464237437 +0000
committer android-build-merger <android-build-merger@google.com> 1464237437 +0000

Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs
am: ce99e3c571

* commit 'ce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2':
  Track changes to network security config manifest configuration

Change-Id: I6a09710dcef8b19c429f28fa90d72fd38284de3e