diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-01-05 21:11:31 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-05 21:11:32 -0800 |
| commit | 9f338c0725644f84597366c1e4acb680a72b3f00 (patch) | |
| tree | e74c30cacb193d0b6c0456ee99f8d25156bad317 /common/src | |
| parent | 3a8f3026ea4977edb41bf8df288022a5e22dd99e (diff) | |
| parent | 66fcecc0fad7b51fb465c9d28072006bd87554ab (diff) | |
| download | sdk-9f338c0725644f84597366c1e4acb680a72b3f00.zip sdk-9f338c0725644f84597366c1e4acb680a72b3f00.tar.gz sdk-9f338c0725644f84597366c1e4acb680a72b3f00.tar.bz2 | |
Merge "Fix a couple of incorrect license headers"
Diffstat (limited to 'common/src')
4 files changed, 10 insertions, 10 deletions
diff --git a/common/src/com/android/annotations/NonNull.java b/common/src/com/android/annotations/NonNull.java index 585c9f3..e306a31 100644 --- a/common/src/com/android/annotations/NonNull.java +++ b/common/src/com/android/annotations/NonNull.java @@ -1,11 +1,11 @@ /* * Copyright (C) 2011 The Android Open Source Project * - * Licensed under the Eclipse Public License, Version 1.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.eclipse.org/org/documents/epl-v10.php + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/common/src/com/android/annotations/NonNullByDefault.java b/common/src/com/android/annotations/NonNullByDefault.java index e66c77d..23903d1 100644 --- a/common/src/com/android/annotations/NonNullByDefault.java +++ b/common/src/com/android/annotations/NonNullByDefault.java @@ -1,11 +1,11 @@ /* * Copyright (C) 2011 The Android Open Source Project * - * Licensed under the Eclipse Public License, Version 1.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.eclipse.org/org/documents/epl-v10.php + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/common/src/com/android/annotations/Nullable.java b/common/src/com/android/annotations/Nullable.java index f8a0dd1..376c1f6 100755 --- a/common/src/com/android/annotations/Nullable.java +++ b/common/src/com/android/annotations/Nullable.java @@ -1,11 +1,11 @@ /* - * Copyright (C) 2010 The Android Open Source Project + * Copyright (C) 2011 The Android Open Source Project * - * Licensed under the Eclipse Public License, Version 1.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.eclipse.org/org/documents/epl-v10.php + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/common/src/com/android/annotations/VisibleForTesting.java b/common/src/com/android/annotations/VisibleForTesting.java index 6741d93..7f41d70 100755 --- a/common/src/com/android/annotations/VisibleForTesting.java +++ b/common/src/com/android/annotations/VisibleForTesting.java @@ -1,11 +1,11 @@ /* - * Copyright (C) 2010 The Android Open Source Project + * Copyright (C) 2011 The Android Open Source Project * - * Licensed under the Eclipse Public License, Version 1.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.eclipse.org/org/documents/epl-v10.php + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, |