Manually update copyright notices in files that defied the automated process

used in http://codereview.appspot.com/4816058/ ('Automatic update of all copyright notices to reflect new license terms.')

Note that the following files have been left alone, because they name
copyright holders outside of Google.  Please let me know if we need to update
these files:

experimental/CiCarbonSampleMain.c
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
Review URL: http://codereview.appspot.com/4806054

git-svn-id: http://skia.googlecode.com/svn/trunk@1981 2bbb7eff-a529-9590-31e7-b0007b416f81

7 files changed, 21 insertions, 7 deletions

diff --git a/experimental/CocoaDebugger/main.m b/experimental/CocoaDebugger/main.m
index 30daa0e544..cd85c6d018 100644
--- a/experimental/CocoaDebugger/main.m
+++ b/experimental/CocoaDebugger/main.m
@@ -3,7 +3,9 @@
 //  CocoaSampleApp
 //
 //  Created by Yang Su on 6/14/11.
-//  Copyright 2011 Google Inc. All rights reserved.
+//  Copyright 2011 Google Inc.
+//  Use of this source code is governed by a BSD-style license that can be
+//  found in the LICENSE file.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/experimental/FileReaderApp/main.m b/experimental/FileReaderApp/main.m
index 30daa0e544..cd85c6d018 100644
--- a/experimental/FileReaderApp/main.m
+++ b/experimental/FileReaderApp/main.m
@@ -3,7 +3,9 @@
 //  CocoaSampleApp
 //
 //  Created by Yang Su on 6/14/11.
-//  Copyright 2011 Google Inc. All rights reserved.
+//  Copyright 2011 Google Inc.
+//  Use of this source code is governed by a BSD-style license that can be
+//  found in the LICENSE file.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/experimental/SimpleCocoaApp/main.m b/experimental/SimpleCocoaApp/main.m
index 30daa0e544..cd85c6d018 100644
--- a/experimental/SimpleCocoaApp/main.m
+++ b/experimental/SimpleCocoaApp/main.m
@@ -3,7 +3,9 @@
 //  CocoaSampleApp
 //
 //  Created by Yang Su on 6/14/11.
-//  Copyright 2011 Google Inc. All rights reserved.
+//  Copyright 2011 Google Inc.
+//  Use of this source code is governed by a BSD-style license that can be
+//  found in the LICENSE file.
 //
 
 #import <Cocoa/Cocoa.h>
diff --git a/experimental/iOSSampleApp/Shared/SkAlertPrompt.m b/experimental/iOSSampleApp/Shared/SkAlertPrompt.m
index 5156b10e53..be0adf520b 100644
--- a/experimental/iOSSampleApp/Shared/SkAlertPrompt.m
+++ b/experimental/iOSSampleApp/Shared/SkAlertPrompt.m
@@ -3,7 +3,9 @@
 //  iOSSampleApp
 //
 //  Created by Yang Su on 7/6/11.
-//  Copyright 2011 Google Inc. All rights reserved.
+//  Copyright 2011 Google Inc.
+//  Use of this source code is governed by a BSD-style license that can be
+//  found in the LICENSE file.
 //
 
 #import "SkAlertPrompt.h"
diff --git a/experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig b/experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
index 80de334447..e2ce01f414 100644
--- a/experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
+++ b/experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
@@ -3,7 +3,9 @@
 //  iOSSampleApp
 //
 //  Created by Yang Su on 6/30/11.
-//  Copyright 2011 Google Inc. All rights reserved.
+//  Copyright 2011 Google Inc.
+//  Use of this source code is governed by a BSD-style license that can be
+//  found in the LICENSE file.
 //
 GCC_PREFIX_HEADER=iOSSampleApp_Prefix.pch
 
diff --git a/experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig b/experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
index 63ea57fbce..eafd949235 100644
--- a/experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
+++ b/experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
@@ -3,7 +3,9 @@
 //  iOSSampleApp
 //
 //  Created by Yang Su on 6/30/11.
-//  Copyright 2011 Google Inc. All rights reserved.
+//  Copyright 2011 Google Inc.
+//  Use of this source code is governed by a BSD-style license that can be
+//  found in the LICENSE file.
 //
 #include "SkiOSSampleApp-Base"
 
diff --git a/experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig b/experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
index 6acdbc3230..1720318823 100644
--- a/experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
+++ b/experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
@@ -3,7 +3,9 @@
 //  iOSSampleApp
 //
 //  Created by Yang Su on 6/30/11.
-//  Copyright 2011 Google Inc. All rights reserved.
+//  Copyright 2011 Google Inc.
+//  Use of this source code is governed by a BSD-style license that can be
+//  found in the LICENSE file.
 //
 #include "SkiOSSampleApp-Base"
 GCC_PREPROCESSOR_DEFINITIONS=SK_RELEASE SK_BUILD_FOR_IOS