diff options
| author | Elliott Hughes <enh@google.com> | 2015-05-12 17:29:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-12 17:29:25 +0000 |
| commit | 97139e6adc255460a1b12e3ccc7b425d11e05eb1 (patch) | |
| tree | a1b025d8d36adeab7f6c707bc5b2a1631cd7a9a7 /linker | |
| parent | f7009f450e596dc76352da7ceefc8caeeb74ff14 (diff) | |
| parent | f0bd92db8966b04062fda0986dacf80891e1a378 (diff) | |
| download | bionic-97139e6adc255460a1b12e3ccc7b425d11e05eb1.zip bionic-97139e6adc255460a1b12e3ccc7b425d11e05eb1.tar.gz bionic-97139e6adc255460a1b12e3ccc7b425d11e05eb1.tar.bz2 | |
Merge "Update NOTICE files." into mnc-dev
Diffstat (limited to 'linker')
| -rw-r--r-- | linker/NOTICE | 60 |
1 files changed, 38 insertions, 22 deletions
diff --git a/linker/NOTICE b/linker/NOTICE index cb3a1dd..a473ead 100644 --- a/linker/NOTICE +++ b/linker/NOTICE @@ -42,7 +42,7 @@ SUCH DAMAGE. ------------------------------------------------------------------- -Copyright (C) 2008, 2009 The Android Open Source Project +Copyright (C) 2008-2010 The Android Open Source Project All rights reserved. Redistribution and use in source and binary forms, with or without @@ -70,7 +70,7 @@ SUCH DAMAGE. ------------------------------------------------------------------- -Copyright (C) 2008-2010 The Android Open Source Project +Copyright (C) 2010 The Android Open Source Project All rights reserved. Redistribution and use in source and binary forms, with or without @@ -98,7 +98,7 @@ SUCH DAMAGE. ------------------------------------------------------------------- -Copyright (C) 2010 The Android Open Source Project +Copyright (C) 2012 The Android Open Source Project All rights reserved. Redistribution and use in source and binary forms, with or without @@ -126,7 +126,23 @@ SUCH DAMAGE. ------------------------------------------------------------------- -Copyright (C) 2012 The Android Open Source Project +Copyright (C) 2013 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. + +------------------------------------------------------------------- + +Copyright (C) 2013 The Android Open Source Project All rights reserved. Redistribution and use in source and binary forms, with or without @@ -154,7 +170,7 @@ SUCH DAMAGE. ------------------------------------------------------------------- -Copyright (C) 2013 The Android Open Source Project +Copyright (C) 2014 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. @@ -170,7 +186,23 @@ limitations under the License. ------------------------------------------------------------------- -Copyright (C) 2013 The Android Open Source Project +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. + +------------------------------------------------------------------- + +Copyright (C) 2015 The Android Open Source Project All rights reserved. Redistribution and use in source and binary forms, with or without @@ -198,19 +230,3 @@ SUCH DAMAGE. ------------------------------------------------------------------- -Copyright (C) 2014 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. - -------------------------------------------------------------------- - |