OSDN Git Service

Merge "Merge "Track changes to network security config manifest configuration" into...
authorChad Brubaker <cbrubaker@google.com>
Thu, 26 May 2016 04:37:17 +0000 (04:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 04:37:17 +0000 (04:37 +0000)
commit11b56641e5e466f5ca14bd118e819c3f04820d38
tree5cb88b6d22a522198ad38533de8fde1755feadb5
parent1a045584d44030947793f2a48953ce54ff2df0c6
parentce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2
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