Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e988e940 authored Feb 01, 2021 by Remi NGUYEN VAN Committed by Automerger Merge Worker Feb 01, 2021

resolve merge conflicts of 546e2e89 to sc-dev am: 09119c2c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ef5131f148335cb650fd0b6c19491f8d58941b4

parents fbdc668f 09119c2c

core/java/android/net/CaptivePortal.java→packages/Connectivity/framework/src/android/net/CaptivePortal.java

+0 −0

File moved.

core/java/android/net/CaptivePortalData.aidl→packages/Connectivity/framework/src/android/net/CaptivePortalData.aidl

+0 −0

File moved.

core/java/android/net/CaptivePortalData.java→packages/Connectivity/framework/src/android/net/CaptivePortalData.java

+0 −0

File moved.

core/java/android/net/ConnectionInfo.aidl→packages/Connectivity/framework/src/android/net/ConnectionInfo.aidl

+0 −0

File moved.

core/java/android/net/ConnectionInfo.java→packages/Connectivity/framework/src/android/net/ConnectionInfo.java

+0 −0

File moved.