aboutsummaryrefslogtreecommitdiff
path: root/NOTICE
diff options
context:
space:
mode:
authordvdli <70133153+dvdli@users.noreply.github.com>2020-10-19 17:57:53 +0800
committerGitHub <noreply@github.com>2020-10-19 17:57:53 +0800
commit0bfc861f769eab0455461cc10bd323c04862dc99 (patch)
tree52c7323ea8b300d314617d3db9b7d45121978055 /NOTICE
parent16a6e7cd72298af7f1f842e99b3eba53f133c22c (diff)
parent902b8c8f9fa5a2e1937007d7d5ee90f01790808b (diff)
Merge pull request #186 from gkasten/android
Add and update files from Android downstream branch to more closely m…
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