tree d471fdb0b649005fd012afaded7c71635987eb0b
parent df6aaa94f4d23ea10ec240138e42e32294a403cc
parent 82b3b456cda03d163677668c5bc2e02fa85e78d0
author Lucas Lin <lucaslin@google.com> 1616677818 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616677818 +0000

[automerger skipped] Merge "Expose some APIs from ConnectivityManager" am: f43adf215e am: de44994554 am: 82b3b456cd -s ours

am skip reason: skip tag Change-Id I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c with SHA-1 9eae065a2e is already in history

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

Change-Id: Id36817eef371fd456bbb4f95cd713e43b833bae9