tree ffa92404e03bb72604d90b78330201da4bc6e376
parent 01a6b34d1db0d9c477673a1d803bbdb0d73cf543
parent adef15dabb70562fa3147df612d49114b278ec41
author Treehugger Robot <treehugger-gerrit@google.com> 1617635391 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617635391 +0000

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

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

Change-Id: I015c98915193a28d3b53b309b38479247346519b