aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/utils
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-12-13 19:24:05 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-12-13 19:24:05 +0000
commitdd335aeb5d34a8344f98244d722fd205b8e05135 (patch)
tree65cc53b53dc4d50994bc1c36c9e80273ea3bcd83 /src/utils
parent4d3f3cd4f26e5fa823a8d3b616fdcded59d11d70 (diff)
Change to BDS license (as we did with all the other files that were Apache)
Review URL: https://codereview.appspot.com/6948045 git-svn-id: http://skia.googlecode.com/svn/trunk@6787 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/android/ashmem.c15
-rw-r--r--src/utils/android/ashmem.h12
2 files changed, 8 insertions, 19 deletions
diff --git a/src/utils/android/ashmem.c b/src/utils/android/ashmem.c
index ae68103248..0e1e81669d 100644
--- a/src/utils/android/ashmem.c
+++ b/src/utils/android/ashmem.c
@@ -1,17 +1,8 @@
/*
- * Copyright (C) 2008 The Android Open Source Project
+ * Copyright 2008 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.
- * You may obtain a copy of the License at
- *
- * 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,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
*/
/*
diff --git a/src/utils/android/ashmem.h b/src/utils/android/ashmem.h
index 1bc790c1d7..2d6c0b5a47 100644
--- a/src/utils/android/ashmem.h
+++ b/src/utils/android/ashmem.h
@@ -1,10 +1,8 @@
-/* cutils/ashmem.h
- **
- ** Copyright 2008 The Android Open Source Project
- **
- ** This file is dual licensed. It may be redistributed and/or modified
- ** under the terms of the Apache 2.0 License OR version 2 of the GNU
- ** General Public License.
+/*
+ * Copyright 2008 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
*/
#ifndef _CUTILS_ASHMEM_H