| commit | e9abf0ed077b124fa5a4103371f9d3e4d5f49185 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Mon Mar 01 08:07:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 01 08:07:27 2021 +0000 |
| tree | 7d10c8e8cd1f4d00bba1df4ad1a1972da6443d43 | |
| parent | 9523c5708802401d4a041bf4fdfb8875e6b40a08 [diff] | |
| parent | a39f3727f9202f7436acdb3d020e5cf962fb9796 [diff] |
Merge "Fix copyright license of VpnTransportInfo" am: 993c655bf3 am: 03a3a561b1 am: a39f3727f9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibf6ba342dfbc92fc4852b96d1c3f3b3f34cc3322
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.