tree bead5c1f9921ce915535ad484b87c4e24cdfce65
parent 1bc19cb6a9e6643a5ebfe94022350192a8a31a67
parent 0fa2dde613bfd3cbe432fa4c64d84fa91aa24400
author Treehugger Robot <treehugger-gerrit@google.com> 1617632643 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617632643 +0000

Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6 am: 0fa2dde613

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

Change-Id: Iaebc7427cafaf77c025885f2ac317cbead21b068