tree a89f3511c2db39bd74d939c41a877971ab759e6a
parent c9ba0260a322f847da01b3cb380539455605559c
parent 32dbde16410b3248ef0680fb723de51f5a52719f
author Remi NGUYEN VAN <reminv@google.com> 1614309946 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614309946 +0000

Merge "Fix CaptivePortalDataTest on R" am: 32dbde1641

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbfed272ece8e1f4c437281fc6ca46de793520fe