tree a20c08f379ad01b75a9080e6009874b888d4f5a2
parent b6a6843c315ead02fd8ac9031e2c5d0b5e3ee3ef
parent e7408d4f3efb910161276a95d784fad38b6df42a
author Remi NGUYEN VAN <reminv@google.com> 1549511939 -0800
committer android-build-merger <android-build-merger@google.com> 1549511939 -0800

Merge "Check MAINLINE_NETWORK_STACK in ConnectivityService" am: 5cdb4c3451
am: e7408d4f3e

Change-Id: I5684b4fdc0e1030d372287d53f22b66fe8d90420