tree 1a9d91fe2d604babe0dd6be34ba8a48bf8211069
parent bb12b0df4107ad0a45d985e50317d7af52af758f
parent e753cb6d5bb21be13cf53ff83863de78bb8d10a3
author Remi NGUYEN VAN <reminv@google.com> 1614585759 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614585759 +0000

Merge "Fix CaptivePortalDataTest on R" am: 32dbde1641 am: 24f7848d23 am: e753cb6d5b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd6711e5caafd92bba9f251742fd3c53efeea672