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

Commit bc889040 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "Fix copyright license of VpnTransportInfo" am: 594e8def am: 9044d1e4 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1172acbf1f7cb693dd06db368fe5fe70dcc11858
parents 36dfffbd 9044d1e4

packages/Connectivity/framework/src/android/net/VpnTransportInfo.java

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

tests/net/java/android/net/VpnTransportInfoTest.java

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.