summaryrefslogtreecommitdiff
path: root/COPYRIGHT.txt
diff options
context:
space:
mode:
Diffstat (limited to 'COPYRIGHT.txt')
-rw-r--r--COPYRIGHT.txt18
1 files changed, 16 insertions, 2 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index ac64049..f64b331 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,5 +1,19 @@
-The following license covers all material remaining in this directory,
-except SlowCRTest.java, which is covered by an Apache 2.0 license.
+Copyright (C) 2015 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.
+
+All material in this directory, except SlowCRTest.java and ConversionTest.java,
+is also covered by one or both of the following:
Copyright © 1999, Silicon Graphics, Inc. -- ALL RIGHTS RESERVED