tree 675e055ae505cfe0697b1ce7abb4966d56e2265b
parent b04621eb3cfd47902d43d172222759a255a3a751
parent 4d22d8279f94849d0e20008fedb73748f68aaef9
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: ba3cedd7f1 am: 4d22d8279f

Change-Id: Iebeb70078906b5eb12b17ee14c8ac7ea749917b2