From: Chad Brubaker <cbrubaker@google.com>
Date: Wed, 2 Aug 2017 17:51:46 +0000 (+0000)
Subject: Merge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a... 
X-Git-Tag: android-x86-9.0-r1~410^2~3^2~56
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=13c192f9a1180266e4816a62c3eead5edd7e6811;p=android-x86%2Fframeworks-base.git

Merge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a am: 531f1af615
am: 5813bc2b22

Change-Id: I649c914986c16b5594219425a391c03e0a9b4390
---

13c192f9a1180266e4816a62c3eead5edd7e6811