tree 675e055ae505cfe0697b1ce7abb4966d56e2265b
parent 4771b437014f6bad6fca9d568d670abb534a72b6
parent 9dd19a4b8316a0439ae44df427ce28bc53156db1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581577764 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581577764 +0000

Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: d0f3cb625e am: 9dd19a4b83

Change-Id: Iebeb70078906b5eb12b17ee14c8ac7ea749917b2