diff options
| author | 2021-03-01 08:07:27 +0000 | |
|---|---|---|
| committer | 2021-03-01 08:07:27 +0000 | |
| commit | 69b8cbd32e299e53fee26bb6a1efcdfce970cffd (patch) | |
| tree | 722c7d2770d048c2f55196c77c0ee11868b5b5e1 | |
| parent | fdfc090a986016b713288e7da33dd5149bf385c9 (diff) | |
| parent | bc88904010d8b3a614d773c1d7161a8f679aab42 (diff) | |
Merge "Fix copyright license of VpnTransportInfo" am: 594e8def4c am: 9044d1e472 am: bc88904010
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf6ba342dfbc92fc4852b96d1c3f3b3f34cc3322
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/VpnTransportInfo.java | 2 | ||||
| -rw-r--r-- | tests/net/java/android/net/VpnTransportInfoTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/Connectivity/framework/src/android/net/VpnTransportInfo.java b/packages/Connectivity/framework/src/android/net/VpnTransportInfo.java index 0242ba08742c..340141b78aa5 100644 --- a/packages/Connectivity/framework/src/android/net/VpnTransportInfo.java +++ b/packages/Connectivity/framework/src/android/net/VpnTransportInfo.java @@ -1,5 +1,5 @@ /* - * 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. diff --git a/tests/net/java/android/net/VpnTransportInfoTest.java b/tests/net/java/android/net/VpnTransportInfoTest.java index 866f38c84333..d04c87b29c25 100644 --- a/tests/net/java/android/net/VpnTransportInfoTest.java +++ b/tests/net/java/android/net/VpnTransportInfoTest.java @@ -1,5 +1,5 @@ /* - * 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. |