From: Chad Brubaker <cbrubaker@google.com>
Date: Wed, 2 Aug 2017 17:41:21 +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~4^2~26
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5813bc2b22722c8a766ee59824884a6e6c9b8cbd;p=android-x86%2Fframeworks-base.git

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

Change-Id: I77240a60f796c63acd640b8a43cb7054ad2a8bee
---

5813bc2b22722c8a766ee59824884a6e6c9b8cbd