aboutsummaryrefslogtreecommitdiff
path: root/NOTICE
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2020-09-22 08:54:56 -0700
committerGlenn Kasten <gkasten@google.com>2020-09-22 15:19:39 -0700
commit902b8c8f9fa5a2e1937007d7d5ee90f01790808b (patch)
tree8ddf7a85dd8d83284ae69ffe6ae16f2c3fbfff97 /NOTICE
parent15b7725e0a415ec34592fa325db63cf58a892a47 (diff)
Add and update files from Android downstream branch to more closely match
Change-Id: If0ebdf44667202eaf73ec41f583092bf61e88b63
Diffstat (limited to 'NOTICE')
-rw-r--r--NOTICE2
1 files changed, 2 insertions, 0 deletions
diff --git a/NOTICE b/NOTICE
index fea2b45..5debd99 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,5 @@
Copyright 2011, The Android Open Source Project
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
@@ -9,6 +10,7 @@ modification, are permitted provided that the following conditions are met:
* Neither the name of The Android Open Source Project nor the names of
its contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
+
THIS SOFTWARE IS PROVIDED BY The Android Open Source Project ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE