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

LICENSE

@@ -0,0 +1,27 @@
+// Copyright (c) 2011 Google Inc. All rights reserved.
+//
+// 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
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

android_sample/SampleApp/AndroidManifest.xml

@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 Skia
+<!-- Copyright 2011 Google Inc.
 
-     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.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.skia.sampleapp"

android_sample/SampleApp/res/layout/layout.xml

@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 Skia
+<!-- Copyright 2011 Google Inc.
 
-     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.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/holder"

android_sample/SampleApp/res/menu/sample.xml

@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 Skia
+<!-- Copyright 2011 Google Inc.
 
-     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.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
 -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">

android_sample/SampleApp/res/values/strings.xml

@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 Skia
+<!-- Copyright 2011 Google Inc.
 
-     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.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">SampleApp</string>

android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java

@@ -1,17 +1,8 @@
 /*
- * Copyright (C) 2011 Skia
+ * Copyright 2011 Google Inc.
  *
- * 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.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  */
 
 package com.skia.sampleapp;

android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java

@@ -1,17 +1,8 @@
 /*
- * Copyright (C) 2011 Skia
+ * Copyright 2011 Google Inc.
  *
- * 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.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  */
 
 package com.skia.sampleapp;

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>

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>

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>

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"

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
 

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"
 

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

gyp/common.gypi

@@ -1,16 +1,7 @@
-# Copyright (C) 2011 The Android Open Source Project
+# Copyright 2011 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.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 {
   # Define all variables, allowing for override in GYP_DEFINES.
   #

gyp_skia

@@ -1,18 +1,9 @@
 #!/usr/bin/python
+
+# Copyright 2011 The Android Open Source Project
 #
-# Copyright (C) 2011 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.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 # This script is a wrapper which invokes gyp with the correct --depth argument,
 # and supports the automatic regeneration of build files if all.gyp is

include/ports/SkHarfBuzzFont.h

@@ -1,31 +1,8 @@
 /*
- * Copyright (c) 2009, Google Inc. All rights reserved.
+ * Copyright 2009 Google Inc.
  *
- * 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
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  */
 
 #ifndef SkHarfBuzzFont_DEFINED
@@ -63,4 +40,3 @@ public:
 };
 
 #endif
-

make.bat

@@ -1,16 +1,7 @@
 @rem    Copyright 2011 Google Inc.
 @rem
-@rem    Licensed under the Apache License, Version 2.0 (the "License");
-@rem    you may not use this file except in compliance with the License.
-@rem    You may obtain a copy of the License at
-@rem
-@rem         http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem    Unless required by applicable law or agreed to in writing, software
-@rem    distributed under the License is distributed on an "AS IS" BASIS,
-@rem    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem    See the License for the specific language governing permissions and
-@rem    limitations under the License.
+@rem    Use of this source code is governed by a BSD-style license that can be
+@rem    found in the LICENSE file.
 
 @rem Launches make.py on Windows, after setting Visual Studio environment variables.
 @rem See http://code.google.com/p/skia/wiki/GettingStartedOnWindows

make.py

@@ -1,16 +1,7 @@
-#    Copyright 2011 Google Inc.
+# Copyright 2011 Google Inc.
 #
-#    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.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 # "Makefile" replacement to build skia for Windows.
 # More info at http://code.google.com/p/skia/wiki/DocRoot
@@ -182,4 +173,3 @@ def Make(args):
 Make(sys.argv[1:])
 
     
-

samplecode/SampleDrawBitmap.cpp

@@ -1,3 +1,10 @@
+
+/*
+ * 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 "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
@@ -75,4 +82,3 @@ private:
 
 static SkView* MyFactory() { return new DrawBitmapView; }
 static SkViewRegister reg(MyFactory);
-

src/opts/memset.arm.S

@@ -1,17 +1,8 @@
 /*
- * Copyright (C) 2010 The Android Open Source Project
+ * Copyright 2010 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.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  */
 
 /* Changes:

src/opts/memset16_neon.S

@@ -1,17 +1,8 @@
 /***************************************************************************
- Copyright (c) 2009,2010, Code Aurora Forum. All rights reserved.
-
- 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) 2009,2010, Code Aurora Forum. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  ***************************************************************************/
 
 /***************************************************************************

src/opts/memset32_neon.S

@@ -1,17 +1,8 @@
 /***************************************************************************
- Copyright (c) 2009,2010, Code Aurora Forum. All rights reserved.
-
- 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) 2009,2010, Code Aurora Forum. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  ***************************************************************************/
 
 	.code 32

src/opts/opts_check_arm.cpp

@@ -1,18 +1,9 @@
 /***************************************************************************
- Copyright (c) 2010, Code Aurora Forum. All rights reserved.
- Copyright 2006-2010, 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) 2010, Code Aurora Forum. All rights reserved.
+ * Copyright 2006-2010, The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  ***************************************************************************/
 
 /* Changes:

src/ports/SkDebug_brew.cpp

@@ -1,20 +1,11 @@
 /* libs/corecg/SkDebug_brew.cpp
-**
-** Copyright 2009, The Android Open Source Project
-** Copyright 2009, Company 100, Inc.
-**
-** 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 2009, The Android Open Source Project
+ * Copyright 2009, Company 100, Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include "SkTypes.h"
 

src/ports/SkMemory_brew.cpp

@@ -1,20 +1,11 @@
 /* libs/graphics/ports/SkMemory_brew.cpp
-**
-** Copyright 2009, The Android Open Source Project
-** Copyright 2009, Company 100, Inc.
-**
-** 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 2009, The Android Open Source Project
+ * Copyright 2009, Company 100, Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include "SkTypes.h"
 
@@ -62,4 +53,3 @@ void* sk_malloc_flags(size_t size, unsigned flags) {
 }
 
 #endif
-

src/ports/SkOSFile_brew.cpp

@@ -1,20 +1,12 @@
 /* libs/graphics/ports/SkOSFile_brew.cpp
-**
-** Copyright 2006, The Android Open Source Project
-** Copyright 2009, Company 100, Inc.
-**
-** 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 2006, The Android Open Source Project
+ * Copyright 2009, Company 100, Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 
 #include "SkOSFile.h"
 
@@ -96,4 +88,3 @@ void sk_fclose(SkFILE* f)
 }
 
 #endif
-

src/utils/ios/SkImageDecoder_iOS.mm

@@ -1,6 +1,9 @@
 /*
-    Copyright 2010, Tetrark Inc.
-*/
+ * Copyright 2010 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #import <CoreGraphics/CoreGraphics.h>
 #include <CoreGraphics/CGColorSpace.h>

src/utils/ios/SkOSFile_iOS.mm

@@ -1,6 +1,10 @@
 /*
-    Copyright 2010, Tetrark Inc.
-*/
+ * Copyright 2010 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include <Foundation/Foundation.h>
 #include "SkOSFile.h"
 #include "SkString.h"

src/utils/ios/SkStream_NSData.mm

@@ -1,5 +1,8 @@
 /*
-    Copyright 2010, Tetrark Inc.
+ * Copyright 2010 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  */
 
 #include "SkStream_NSData.h"

tests/FillPathTest.cpp

@@ -1,17 +1,8 @@
 /*
- * Copyright (C) 2010 The Chromium Authors. All rights reserved.
+ * Copyright 2010 Google Inc.
  *
- * 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.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  */
 
 #include "Test.h"