From: Hugo Benichi <hugobenichi@google.com>
Date: Tue, 16 Jan 2018 02:31:48 +0000 (+0000)
Subject: Merge "ConnectivityService: synchronize access on mLockdownEnabled" am: 46e9e35835
X-Git-Tag: android-x86-9.0-r1~263^2~2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d50943d086d060d7a91a0b35b0d4949ef37ebcaa;p=android-x86%2Fframeworks-base.git

Merge "ConnectivityService: synchronize access on mLockdownEnabled" am: 46e9e35835
am: 2d59e3cab0

Change-Id: Icadee616fc95e1c126285524dfe49331fcf87462
---

d50943d086d060d7a91a0b35b0d4949ef37ebcaa