tree 44ee52a7ded182e4ea97e084cf7b38f2e4b5322d
parent 3c649ed68497f7f0e49e672ed6e62cffcbe05797
parent 7a35f4b4de6b0cbbdc37de88bcc32f1cb6ac12f1
author Paul Hu <paulhu@google.com> 1614834648 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614834648 +0000

Merge "Replace ConnectivityManager hidden symbols on framework" am: 1297f90193 am: 0e37e30151 am: 7a35f4b4de

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd0d0d57bc74aaf9590dcdd4aa76919da8ccb7d0