OSDN Git Service

Merge "ConnectivityService: synchronize access on mLockdownEnabled" am: 46e9e35835
authorHugo Benichi <hugobenichi@google.com>
Tue, 16 Jan 2018 02:31:48 +0000 (02:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Jan 2018 02:31:48 +0000 (02:31 +0000)
am: 2d59e3cab0

Change-Id: Icadee616fc95e1c126285524dfe49331fcf87462


Trivial merge