tree fe796b14579a8eff6d5129b5089797fcfc91ff04
parent c3c133424317ecbe4b3a516690505b34c2840e89
parent 9b44ae63b146fcc9a16f26f12a2bdbdd56839b99
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581578984 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581578984 +0000

[automerger skipped] Merge "Add permission check for CaptivePortal#reevaluateNetwork" am: d0f3cb625e am: 9dd19a4b83 am: 9b44ae63b1 -s ours
am skip reason: Change-Id I559d42089aeb09801d14c251c5165fca793c3cb3 with SHA-1 ca2105f597 is in history

Change-Id: I312db6a0bd341833c53f83be3d72da5b1bf9d7cf