tree 21e4f9632a209884b9cb6d8de0011355945b5adf
parent a3b457d90d41c3b497d17bc7da1b9fa9e8bbcd73
parent 9b03bba6878dc734a6bb3e9673e78ac293c23bf3
author Remi NGUYEN VAN <reminv@google.com> 1549512628 -0800
committer android-build-merger <android-build-merger@google.com> 1549512628 -0800

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

Change-Id: I0a52fc46a22d21147ab7d1594fd79182b5f23eb7