| commit | 31893354d1c8050ad530047433f32ebb0713ce43 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Fri Feb 26 03:56:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 26 03:56:16 2021 +0000 |
| tree | 7b14719dfdde328d436b1a209cc96b33438bb8d2 | |
| parent | 28a0d9f352979c0802b960d2fa5f2e269d03f38c [diff] | |
| parent | ff35256ebd9cb13a7596ab2b88e5c53c7ee3029f [diff] |
Merge "Fix copyright license of VpnTransportInfo" am: ff35256ebd Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifed529b4a91bb3c52acb3d1ce708a5999a2bb595
diff --git a/framework/src/android/net/VpnTransportInfo.java b/framework/src/android/net/VpnTransportInfo.java index 0242ba0..340141b 100644 --- a/framework/src/android/net/VpnTransportInfo.java +++ b/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 866f38c..d04c87b 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.