New drop of Skia. This is up to CL 121320.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6925 0039d316-1c4b-4281-b951-d872f2087c98

146 files changed, 149 insertions, 151 deletions

diff --git a/skia/animator/SkAnimate.h b/skia/animator/SkAnimate.h
index 5500798..a4281d3 100644
--- a/skia/animator/SkAnimate.h
+++ b/skia/animator/SkAnimate.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimate.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimateActive.cpp b/skia/animator/SkAnimateActive.cpp
index 0aa1279..4ee7ded 100644
--- a/skia/animator/SkAnimateActive.cpp
+++ b/skia/animator/SkAnimateActive.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimateActive.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimateActive.h b/skia/animator/SkAnimateActive.h
index 9f6756a..b0c4483 100644
--- a/skia/animator/SkAnimateActive.h
+++ b/skia/animator/SkAnimateActive.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimateActive.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimateBase.cpp b/skia/animator/SkAnimateBase.cpp
index cd11442..10a3b5b 100644
--- a/skia/animator/SkAnimateBase.cpp
+++ b/skia/animator/SkAnimateBase.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimateBase.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimateBase.h b/skia/animator/SkAnimateBase.h
index 5f7b1ec..64b9722 100644
--- a/skia/animator/SkAnimateBase.h
+++ b/skia/animator/SkAnimateBase.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimateBase.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimateField.cpp b/skia/animator/SkAnimateField.cpp
index 67381ea..f1439a2 100644
--- a/skia/animator/SkAnimateField.cpp
+++ b/skia/animator/SkAnimateField.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimateField.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimateMaker.cpp b/skia/animator/SkAnimateMaker.cpp
index 82c3f9a..8a78678 100644
--- a/skia/animator/SkAnimateMaker.cpp
+++ b/skia/animator/SkAnimateMaker.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimateMaker.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimateMaker.h b/skia/animator/SkAnimateMaker.h
index 3c22e5d..dae8caf 100644
--- a/skia/animator/SkAnimateMaker.h
+++ b/skia/animator/SkAnimateMaker.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimateMaker.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimateProperties.h b/skia/animator/SkAnimateProperties.h
index a49d2b3..9e3da9ae 100644
--- a/skia/animator/SkAnimateProperties.h
+++ b/skia/animator/SkAnimateProperties.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimateProperties.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimateSet.cpp b/skia/animator/SkAnimateSet.cpp
index c20496d..dd636da 100644
--- a/skia/animator/SkAnimateSet.cpp
+++ b/skia/animator/SkAnimateSet.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimateSet.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimateSet.h b/skia/animator/SkAnimateSet.h
index 8e88b41..9f9ecfb 100644
--- a/skia/animator/SkAnimateSet.h
+++ b/skia/animator/SkAnimateSet.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimateSet.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimator.cpp b/skia/animator/SkAnimator.cpp
index 19c0214..242398b 100644
--- a/skia/animator/SkAnimator.cpp
+++ b/skia/animator/SkAnimator.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimator.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimatorScript.cpp b/skia/animator/SkAnimatorScript.cpp
index 808a596..eafe1db 100644
--- a/skia/animator/SkAnimatorScript.cpp
+++ b/skia/animator/SkAnimatorScript.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimatorScript.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkAnimatorScript.h b/skia/animator/SkAnimatorScript.h
index b3e946b..2fdb029 100644
--- a/skia/animator/SkAnimatorScript.h
+++ b/skia/animator/SkAnimatorScript.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkAnimatorScript.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkBase64.cpp b/skia/animator/SkBase64.cpp
index 5b48acd..e192a52 100644
--- a/skia/animator/SkBase64.cpp
+++ b/skia/animator/SkBase64.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkBase64.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkBase64.h b/skia/animator/SkBase64.h
index 89a179b..12ccf8c 100644
--- a/skia/animator/SkBase64.h
+++ b/skia/animator/SkBase64.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkBase64.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkBoundable.cpp b/skia/animator/SkBoundable.cpp
index 12fb201..f2125ea 100644
--- a/skia/animator/SkBoundable.cpp
+++ b/skia/animator/SkBoundable.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkBoundable.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkBoundable.h b/skia/animator/SkBoundable.h
index 1c21cd2..67f5a12 100644
--- a/skia/animator/SkBoundable.h
+++ b/skia/animator/SkBoundable.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkBoundable.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkBuildCondensedInfo.cpp b/skia/animator/SkBuildCondensedInfo.cpp
index 361a8bd..5e4eedc 100644
--- a/skia/animator/SkBuildCondensedInfo.cpp
+++ b/skia/animator/SkBuildCondensedInfo.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkBuildCondensedInfo.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkCondensedDebug.cpp b/skia/animator/SkCondensedDebug.cpp
index 1d20025a..e7b7ff1 100644
--- a/skia/animator/SkCondensedDebug.cpp
+++ b/skia/animator/SkCondensedDebug.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkCondensedDebug.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkCondensedRelease.cpp b/skia/animator/SkCondensedRelease.cpp
index 87d5d7c..a493cb3 100644
--- a/skia/animator/SkCondensedRelease.cpp
+++ b/skia/animator/SkCondensedRelease.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkCondensedRelease.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayAdd.cpp b/skia/animator/SkDisplayAdd.cpp
index ac8d9c0..8a97a06 100644
--- a/skia/animator/SkDisplayAdd.cpp
+++ b/skia/animator/SkDisplayAdd.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayAdd.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayAdd.h b/skia/animator/SkDisplayAdd.h
index 8429fc8..0f3edc9 100644
--- a/skia/animator/SkDisplayAdd.h
+++ b/skia/animator/SkDisplayAdd.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayAdd.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayApply.cpp b/skia/animator/SkDisplayApply.cpp
index 8926299..b9e65f7 100644
--- a/skia/animator/SkDisplayApply.cpp
+++ b/skia/animator/SkDisplayApply.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayApply.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayApply.h b/skia/animator/SkDisplayApply.h
index 208caa2..d51e467 100644
--- a/skia/animator/SkDisplayApply.h
+++ b/skia/animator/SkDisplayApply.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayApply.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayBounds.cpp b/skia/animator/SkDisplayBounds.cpp
index 03d7366..d0499ce 100644
--- a/skia/animator/SkDisplayBounds.cpp
+++ b/skia/animator/SkDisplayBounds.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayBounds.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayBounds.h b/skia/animator/SkDisplayBounds.h
index fdfb78b..6fcd09c 100644
--- a/skia/animator/SkDisplayBounds.h
+++ b/skia/animator/SkDisplayBounds.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayBounds.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayEvent.cpp b/skia/animator/SkDisplayEvent.cpp
index 4d27158..6253cdf 100644
--- a/skia/animator/SkDisplayEvent.cpp
+++ b/skia/animator/SkDisplayEvent.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayEvent.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayEvent.h b/skia/animator/SkDisplayEvent.h
index e1e66df..837cfec 100644
--- a/skia/animator/SkDisplayEvent.h
+++ b/skia/animator/SkDisplayEvent.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayEvent.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayEvents.cpp b/skia/animator/SkDisplayEvents.cpp
index 0f13b70..e6a01ba 100644
--- a/skia/animator/SkDisplayEvents.cpp
+++ b/skia/animator/SkDisplayEvents.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayEvents.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayEvents.h b/skia/animator/SkDisplayEvents.h
index e22f5c8..73721d4 100644
--- a/skia/animator/SkDisplayEvents.h
+++ b/skia/animator/SkDisplayEvents.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayEvents.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayInclude.cpp b/skia/animator/SkDisplayInclude.cpp
index 52f2e7c..26b1e69 100644
--- a/skia/animator/SkDisplayInclude.cpp
+++ b/skia/animator/SkDisplayInclude.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayInclude.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayInclude.h b/skia/animator/SkDisplayInclude.h
index af67942..81ad76a 100644
--- a/skia/animator/SkDisplayInclude.h
+++ b/skia/animator/SkDisplayInclude.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayInclude.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayInput.cpp b/skia/animator/SkDisplayInput.cpp
index bd034db..3688930 100644
--- a/skia/animator/SkDisplayInput.cpp
+++ b/skia/animator/SkDisplayInput.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayInput.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayInput.h b/skia/animator/SkDisplayInput.h
index 4693c36..ac7c7c1 100644
--- a/skia/animator/SkDisplayInput.h
+++ b/skia/animator/SkDisplayInput.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayInput.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayList.cpp b/skia/animator/SkDisplayList.cpp
index 84889d8..57f29f7 100644
--- a/skia/animator/SkDisplayList.cpp
+++ b/skia/animator/SkDisplayList.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayList.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayList.h b/skia/animator/SkDisplayList.h
index 7f127ba..3743e35 100644
--- a/skia/animator/SkDisplayList.h
+++ b/skia/animator/SkDisplayList.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayList.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayMath.cpp b/skia/animator/SkDisplayMath.cpp
index 9facb9b..66bd1f8 100644
--- a/skia/animator/SkDisplayMath.cpp
+++ b/skia/animator/SkDisplayMath.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayMath.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayMath.h b/skia/animator/SkDisplayMath.h
index dc1fb9e..de26319 100644
--- a/skia/animator/SkDisplayMath.h
+++ b/skia/animator/SkDisplayMath.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayMath.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayMovie.cpp b/skia/animator/SkDisplayMovie.cpp
index eaf73e0..ed74329 100644
--- a/skia/animator/SkDisplayMovie.cpp
+++ b/skia/animator/SkDisplayMovie.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayMovie.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayMovie.h b/skia/animator/SkDisplayMovie.h
index 9441343..2b8a893 100644
--- a/skia/animator/SkDisplayMovie.h
+++ b/skia/animator/SkDisplayMovie.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayMovie.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayNumber.cpp b/skia/animator/SkDisplayNumber.cpp
index 062fd4a..3bb96d7 100644
--- a/skia/animator/SkDisplayNumber.cpp
+++ b/skia/animator/SkDisplayNumber.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayNumber.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayNumber.h b/skia/animator/SkDisplayNumber.h
index 5429aaf..515c35b 100644
--- a/skia/animator/SkDisplayNumber.h
+++ b/skia/animator/SkDisplayNumber.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayNumber.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayPost.cpp b/skia/animator/SkDisplayPost.cpp
index 464150b..17e7c76 100644
--- a/skia/animator/SkDisplayPost.cpp
+++ b/skia/animator/SkDisplayPost.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayPost.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayPost.h b/skia/animator/SkDisplayPost.h
index ab4ad60..4b75b07 100644
--- a/skia/animator/SkDisplayPost.h
+++ b/skia/animator/SkDisplayPost.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayPost.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayRandom.cpp b/skia/animator/SkDisplayRandom.cpp
index dcdfdaf..ab078cd2 100644
--- a/skia/animator/SkDisplayRandom.cpp
+++ b/skia/animator/SkDisplayRandom.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayRandom.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayRandom.h b/skia/animator/SkDisplayRandom.h
index 73f490b..b40907e 100644
--- a/skia/animator/SkDisplayRandom.h
+++ b/skia/animator/SkDisplayRandom.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayRandom.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayScreenplay.cpp b/skia/animator/SkDisplayScreenplay.cpp
index 7591a13..58180e7 100644
--- a/skia/animator/SkDisplayScreenplay.cpp
+++ b/skia/animator/SkDisplayScreenplay.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayScreenplay.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayScreenplay.h b/skia/animator/SkDisplayScreenplay.h
index 3a7200d..cb8103d 100644
--- a/skia/animator/SkDisplayScreenplay.h
+++ b/skia/animator/SkDisplayScreenplay.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayScreenplay.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayType.cpp b/skia/animator/SkDisplayType.cpp
index 0ecbfb4..90fcd89 100644
--- a/skia/animator/SkDisplayType.cpp
+++ b/skia/animator/SkDisplayType.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayType.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayType.h b/skia/animator/SkDisplayType.h
index 068fcddb..a29b285 100644
--- a/skia/animator/SkDisplayType.h
+++ b/skia/animator/SkDisplayType.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayType.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayTypes.cpp b/skia/animator/SkDisplayTypes.cpp
index 6c6ad08..b5bc573 100644
--- a/skia/animator/SkDisplayTypes.cpp
+++ b/skia/animator/SkDisplayTypes.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayTypes.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayTypes.h b/skia/animator/SkDisplayTypes.h
index 738af18..0ac57ba 100644
--- a/skia/animator/SkDisplayTypes.h
+++ b/skia/animator/SkDisplayTypes.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayTypes.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayXMLParser.cpp b/skia/animator/SkDisplayXMLParser.cpp
index 39c4a39..d2775e8 100644
--- a/skia/animator/SkDisplayXMLParser.cpp
+++ b/skia/animator/SkDisplayXMLParser.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayXMLParser.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayXMLParser.h b/skia/animator/SkDisplayXMLParser.h
index bddc809..2c2bec1 100644
--- a/skia/animator/SkDisplayXMLParser.h
+++ b/skia/animator/SkDisplayXMLParser.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayXMLParser.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayable.cpp b/skia/animator/SkDisplayable.cpp
index 83182e5..e50e1ab 100644
--- a/skia/animator/SkDisplayable.cpp
+++ b/skia/animator/SkDisplayable.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayable.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDisplayable.h b/skia/animator/SkDisplayable.h
index 0c35d10..cbc96de 100644
--- a/skia/animator/SkDisplayable.h
+++ b/skia/animator/SkDisplayable.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDisplayable.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDraw3D.cpp b/skia/animator/SkDraw3D.cpp
index d90cf0a..137de9f 100644
--- a/skia/animator/SkDraw3D.cpp
+++ b/skia/animator/SkDraw3D.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDraw3D.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDraw3D.h b/skia/animator/SkDraw3D.h
index b9be37e..5ab61cd 100644
--- a/skia/animator/SkDraw3D.h
+++ b/skia/animator/SkDraw3D.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDraw3D.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawBitmap.cpp b/skia/animator/SkDrawBitmap.cpp
index f5102ab..25355be 100644
--- a/skia/animator/SkDrawBitmap.cpp
+++ b/skia/animator/SkDrawBitmap.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawBitmap.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawBitmap.h b/skia/animator/SkDrawBitmap.h
index 28ec054..f846193 100644
--- a/skia/animator/SkDrawBitmap.h
+++ b/skia/animator/SkDrawBitmap.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawBitmap.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawBlur.cpp b/skia/animator/SkDrawBlur.cpp
index 618a590..0ebabce 100644
--- a/skia/animator/SkDrawBlur.cpp
+++ b/skia/animator/SkDrawBlur.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawBlur.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawBlur.h b/skia/animator/SkDrawBlur.h
index 5a6e8b3..14ceba0 100644
--- a/skia/animator/SkDrawBlur.h
+++ b/skia/animator/SkDrawBlur.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawBlur.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawClip.cpp b/skia/animator/SkDrawClip.cpp
index 147c3a8..1c01c6a 100644
--- a/skia/animator/SkDrawClip.cpp
+++ b/skia/animator/SkDrawClip.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawClip.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawClip.h b/skia/animator/SkDrawClip.h
index c19694b..2fed99a 100644
--- a/skia/animator/SkDrawClip.h
+++ b/skia/animator/SkDrawClip.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawClip.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawColor.cpp b/skia/animator/SkDrawColor.cpp
index d7934a9..009ca10 100644
--- a/skia/animator/SkDrawColor.cpp
+++ b/skia/animator/SkDrawColor.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawColor.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawColor.h b/skia/animator/SkDrawColor.h
index f1e6d2b..89b87cc 100644
--- a/skia/animator/SkDrawColor.h
+++ b/skia/animator/SkDrawColor.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawColor.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawDash.cpp b/skia/animator/SkDrawDash.cpp
index 1a76064..bdac9cd 100644
--- a/skia/animator/SkDrawDash.cpp
+++ b/skia/animator/SkDrawDash.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawDash.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawDash.h b/skia/animator/SkDrawDash.h
index 39a13ea..c2108c1 100644
--- a/skia/animator/SkDrawDash.h
+++ b/skia/animator/SkDrawDash.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawDash.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawDiscrete.cpp b/skia/animator/SkDrawDiscrete.cpp
index 0afe8f5..e1089c2 100644
--- a/skia/animator/SkDrawDiscrete.cpp
+++ b/skia/animator/SkDrawDiscrete.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawDiscrete.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawDiscrete.h b/skia/animator/SkDrawDiscrete.h
index 9652766..78485ee 100644
--- a/skia/animator/SkDrawDiscrete.h
+++ b/skia/animator/SkDrawDiscrete.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawDiscrete.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawEmboss.cpp b/skia/animator/SkDrawEmboss.cpp
index ed1433c..77f6dfd 100644
--- a/skia/animator/SkDrawEmboss.cpp
+++ b/skia/animator/SkDrawEmboss.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawEmboss.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawEmboss.h b/skia/animator/SkDrawEmboss.h
index 51c60a1..fe6911b 100644
--- a/skia/animator/SkDrawEmboss.h
+++ b/skia/animator/SkDrawEmboss.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawEmboss.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawExtraPathEffect.cpp b/skia/animator/SkDrawExtraPathEffect.cpp
index 2a9cb2f..4cca738 100644
--- a/skia/animator/SkDrawExtraPathEffect.cpp
+++ b/skia/animator/SkDrawExtraPathEffect.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawExtraPathEffect.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawFull.cpp b/skia/animator/SkDrawFull.cpp
index 9c964eb3..c6568dbf 100644
--- a/skia/animator/SkDrawFull.cpp
+++ b/skia/animator/SkDrawFull.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawFull.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawFull.h b/skia/animator/SkDrawFull.h
index 68fe130..cfbb643 100644
--- a/skia/animator/SkDrawFull.h
+++ b/skia/animator/SkDrawFull.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawFull.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawGradient.cpp b/skia/animator/SkDrawGradient.cpp
index 4ae7b4f..e9061b5 100644
--- a/skia/animator/SkDrawGradient.cpp
+++ b/skia/animator/SkDrawGradient.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawGradient.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawGradient.h b/skia/animator/SkDrawGradient.h
index 4b4a3cd..30a86df 100644
--- a/skia/animator/SkDrawGradient.h
+++ b/skia/animator/SkDrawGradient.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawGradient.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawGroup.cpp b/skia/animator/SkDrawGroup.cpp
index 4c215a1..aa53564 100644
--- a/skia/animator/SkDrawGroup.cpp
+++ b/skia/animator/SkDrawGroup.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawGroup.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawGroup.h b/skia/animator/SkDrawGroup.h
index da153a0e1..0009a4c 100644
--- a/skia/animator/SkDrawGroup.h
+++ b/skia/animator/SkDrawGroup.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawGroup.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawLine.cpp b/skia/animator/SkDrawLine.cpp
index 4fee464..166cbbc 100644
--- a/skia/animator/SkDrawLine.cpp
+++ b/skia/animator/SkDrawLine.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawLine.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawLine.h b/skia/animator/SkDrawLine.h
index 80451e3..8f771cf 100644
--- a/skia/animator/SkDrawLine.h
+++ b/skia/animator/SkDrawLine.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawLine.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawMatrix.cpp b/skia/animator/SkDrawMatrix.cpp
index 8ccd9c1..dbdbf19 100644
--- a/skia/animator/SkDrawMatrix.cpp
+++ b/skia/animator/SkDrawMatrix.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawMatrix.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawMatrix.h b/skia/animator/SkDrawMatrix.h
index 1cf00ff..8339d8c 100644
--- a/skia/animator/SkDrawMatrix.h
+++ b/skia/animator/SkDrawMatrix.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawMatrix.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawOval.cpp b/skia/animator/SkDrawOval.cpp
index 734bcad..0e3a9ae 100644
--- a/skia/animator/SkDrawOval.cpp
+++ b/skia/animator/SkDrawOval.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawOval.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawOval.h b/skia/animator/SkDrawOval.h
index 2bfec9d..0e7ae3f 100644
--- a/skia/animator/SkDrawOval.h
+++ b/skia/animator/SkDrawOval.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawOval.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawPaint.cpp b/skia/animator/SkDrawPaint.cpp
index a1b67f5..68caa5a3 100644
--- a/skia/animator/SkDrawPaint.cpp
+++ b/skia/animator/SkDrawPaint.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawPaint.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
@@ -195,7 +195,7 @@ bool SkDrawPaint::getProperty(int index, SkScriptValue* value) const {
         case SK_PROPERTY(descent):
             value->fOperand.fScalar = metrics.fDescent;
             break;
-        // should consider returning fLeading as well (or roll it into ascent/descent somehow <reed>
+        // should consider returning fLeading as well (or roll it into ascent/descent somehow 
         default:
             SkASSERT(0);
             return false;
@@ -275,4 +275,3 @@ void SkDrawPaint::setupPaint(SkPaint* paint) const {
     if (xfermode != (SkPorterDuff::Mode) -1) 
         paint->setPorterDuffXfermode((SkPorterDuff::Mode) xfermode);
 }
-
diff --git a/skia/animator/SkDrawPaint.h b/skia/animator/SkDrawPaint.h
index 9c4df61..ea77acd 100644
--- a/skia/animator/SkDrawPaint.h
+++ b/skia/animator/SkDrawPaint.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawPaint.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawPath.cpp b/skia/animator/SkDrawPath.cpp
index c1cbad5..895e597 100644
--- a/skia/animator/SkDrawPath.cpp
+++ b/skia/animator/SkDrawPath.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawPath.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawPath.h b/skia/animator/SkDrawPath.h
index 719b3461..673051a 100644
--- a/skia/animator/SkDrawPath.h
+++ b/skia/animator/SkDrawPath.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawPath.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawPoint.cpp b/skia/animator/SkDrawPoint.cpp
index 8654e9a..383a599 100644
--- a/skia/animator/SkDrawPoint.cpp
+++ b/skia/animator/SkDrawPoint.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawPoint.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawPoint.h b/skia/animator/SkDrawPoint.h
index 30fd243..d06e5b7 100644
--- a/skia/animator/SkDrawPoint.h
+++ b/skia/animator/SkDrawPoint.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawPoint.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawRectangle.cpp b/skia/animator/SkDrawRectangle.cpp
index 2971e8c..f2054bd 100644
--- a/skia/animator/SkDrawRectangle.cpp
+++ b/skia/animator/SkDrawRectangle.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawRectangle.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawRectangle.h b/skia/animator/SkDrawRectangle.h
index 51edcc5..9f8bc0a 100644
--- a/skia/animator/SkDrawRectangle.h
+++ b/skia/animator/SkDrawRectangle.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawRectangle.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawSaveLayer.cpp b/skia/animator/SkDrawSaveLayer.cpp
index c78ef30..bc2288f 100644
--- a/skia/animator/SkDrawSaveLayer.cpp
+++ b/skia/animator/SkDrawSaveLayer.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawSaveLayer.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawSaveLayer.h b/skia/animator/SkDrawSaveLayer.h
index c247219..52a36a4 100644
--- a/skia/animator/SkDrawSaveLayer.h
+++ b/skia/animator/SkDrawSaveLayer.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawSaveLayer.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawShader.cpp b/skia/animator/SkDrawShader.cpp
index 2ff225b..b38718e 100644
--- a/skia/animator/SkDrawShader.cpp
+++ b/skia/animator/SkDrawShader.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawShader.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
@@ -78,9 +78,9 @@ SkShader* SkDrawBitmapShader::getShader() {
     // note: bitmap shader now supports independent tile modes for X and Y
     // we pass the same to both, but later we should extend this flexibility
     // to the xml (e.g. tileModeX="repeat" tileModeY="clmap")
-    // <reed>
+    // 
     // oops, bitmapshader no longer takes filterBitmap, but deduces it at
-    // draw-time from the paint <reed>
+    // draw-time from the paint 
     SkShader* shader  = SkShader::CreateBitmapShader(image->fBitmap, 
                                                     (SkShader::TileMode) tileMode,
                                                     (SkShader::TileMode) tileMode);
@@ -89,4 +89,3 @@ SkShader* SkDrawBitmapShader::getShader() {
     (void)autoDel.detach();
     return shader;
 }
-
diff --git a/skia/animator/SkDrawShader.h b/skia/animator/SkDrawShader.h
index 9fd94a5..35ca419 100644
--- a/skia/animator/SkDrawShader.h
+++ b/skia/animator/SkDrawShader.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawShader.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawText.cpp b/skia/animator/SkDrawText.cpp
index d2f3992..dcc3a75 100644
--- a/skia/animator/SkDrawText.cpp
+++ b/skia/animator/SkDrawText.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawText.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawText.h b/skia/animator/SkDrawText.h
index cc5ce80..cb1d1b9 100644
--- a/skia/animator/SkDrawText.h
+++ b/skia/animator/SkDrawText.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawText.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawTextBox.cpp b/skia/animator/SkDrawTextBox.cpp
index 2c3108f..4c4ac76 100644
--- a/skia/animator/SkDrawTextBox.cpp
+++ b/skia/animator/SkDrawTextBox.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawTextBox.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawTextBox.h b/skia/animator/SkDrawTextBox.h
index 6396eac..ee97c22 100644
--- a/skia/animator/SkDrawTextBox.h
+++ b/skia/animator/SkDrawTextBox.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawTextBox.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawTo.cpp b/skia/animator/SkDrawTo.cpp
index 7176e40..342f7d4 100644
--- a/skia/animator/SkDrawTo.cpp
+++ b/skia/animator/SkDrawTo.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawTo.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawTo.h b/skia/animator/SkDrawTo.h
index c9268ae..0ad78e8c 100644
--- a/skia/animator/SkDrawTo.h
+++ b/skia/animator/SkDrawTo.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawTo.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawTransparentShader.cpp b/skia/animator/SkDrawTransparentShader.cpp
index 8282248..c1da687 100644
--- a/skia/animator/SkDrawTransparentShader.cpp
+++ b/skia/animator/SkDrawTransparentShader.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawTransparentShader.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawTransparentShader.h b/skia/animator/SkDrawTransparentShader.h
index 8c0c49e..e831883 100644
--- a/skia/animator/SkDrawTransparentShader.h
+++ b/skia/animator/SkDrawTransparentShader.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawTransparentShader.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawable.cpp b/skia/animator/SkDrawable.cpp
index 631ebb1..6968fe1 100644
--- a/skia/animator/SkDrawable.cpp
+++ b/skia/animator/SkDrawable.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawable.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDrawable.h b/skia/animator/SkDrawable.h
index 1f932ad..7284a25 100644
--- a/skia/animator/SkDrawable.h
+++ b/skia/animator/SkDrawable.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDrawable.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDump.cpp b/skia/animator/SkDump.cpp
index 5e8b92d..eac956c 100644
--- a/skia/animator/SkDump.cpp
+++ b/skia/animator/SkDump.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDump.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkDump.h b/skia/animator/SkDump.h
index 8b38f35..73a6957 100644
--- a/skia/animator/SkDump.h
+++ b/skia/animator/SkDump.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkDump.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkExtras.h b/skia/animator/SkExtras.h
index b792758..88e9b2d 100644
--- a/skia/animator/SkExtras.h
+++ b/skia/animator/SkExtras.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkExtras.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkGetCondensedInfo.cpp b/skia/animator/SkGetCondensedInfo.cpp
index 35f7171..ee91caa 100644
--- a/skia/animator/SkGetCondensedInfo.cpp
+++ b/skia/animator/SkGetCondensedInfo.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkGetCondensedInfo.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkHitClear.cpp b/skia/animator/SkHitClear.cpp
index e88ab92..e7e301dc 100644
--- a/skia/animator/SkHitClear.cpp
+++ b/skia/animator/SkHitClear.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkHitClear.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkHitClear.h b/skia/animator/SkHitClear.h
index 8a41e0c..f2b50c0 100644
--- a/skia/animator/SkHitClear.h
+++ b/skia/animator/SkHitClear.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkHitClear.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkHitTest.cpp b/skia/animator/SkHitTest.cpp
index f54ca9a..585249a 100644
--- a/skia/animator/SkHitTest.cpp
+++ b/skia/animator/SkHitTest.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkHitTest.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkHitTest.h b/skia/animator/SkHitTest.h
index a786cb2..b3a9d85 100644
--- a/skia/animator/SkHitTest.h
+++ b/skia/animator/SkHitTest.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkHitTest.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkIntArray.h b/skia/animator/SkIntArray.h
index bb58541..b2a49c1 100644
--- a/skia/animator/SkIntArray.h
+++ b/skia/animator/SkIntArray.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkIntArray.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkMatrixParts.cpp b/skia/animator/SkMatrixParts.cpp
index d5bdcc1..56bb2d0 100644
--- a/skia/animator/SkMatrixParts.cpp
+++ b/skia/animator/SkMatrixParts.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkMatrixParts.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkMatrixParts.h b/skia/animator/SkMatrixParts.h
index 5fcf115..d97d9fb 100644
--- a/skia/animator/SkMatrixParts.h
+++ b/skia/animator/SkMatrixParts.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkMatrixParts.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkMemberInfo.cpp b/skia/animator/SkMemberInfo.cpp
index d4f4e51..50536c2 100644
--- a/skia/animator/SkMemberInfo.cpp
+++ b/skia/animator/SkMemberInfo.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkMemberInfo.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkMemberInfo.h b/skia/animator/SkMemberInfo.h
index 00dd7b6..e45994e 100644
--- a/skia/animator/SkMemberInfo.h
+++ b/skia/animator/SkMemberInfo.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkMemberInfo.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkOperand.h b/skia/animator/SkOperand.h
index 65ee592..2c7e93b 100644
--- a/skia/animator/SkOperand.h
+++ b/skia/animator/SkOperand.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkOperand.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkOperandInterpolator.h b/skia/animator/SkOperandInterpolator.h
index d623475..f155276 100644
--- a/skia/animator/SkOperandInterpolator.h
+++ b/skia/animator/SkOperandInterpolator.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkOperandInterpolator.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkOperandIterpolator.cpp b/skia/animator/SkOperandIterpolator.cpp
index 0204221..2bddd34 100644
--- a/skia/animator/SkOperandIterpolator.cpp
+++ b/skia/animator/SkOperandIterpolator.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkOperandIterpolator.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkPaintParts.cpp b/skia/animator/SkPaintParts.cpp
index a6c0fa1..48799c6 100644
--- a/skia/animator/SkPaintParts.cpp
+++ b/skia/animator/SkPaintParts.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkPaintParts.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkPaintParts.h b/skia/animator/SkPaintParts.h
index 615a028..a8bb8bd 100644
--- a/skia/animator/SkPaintParts.h
+++ b/skia/animator/SkPaintParts.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkPaintParts.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkPathParts.cpp b/skia/animator/SkPathParts.cpp
index e015d66..46d2232 100644
--- a/skia/animator/SkPathParts.cpp
+++ b/skia/animator/SkPathParts.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkPathParts.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkPathParts.h b/skia/animator/SkPathParts.h
index 4af0295b..72e4185 100644
--- a/skia/animator/SkPathParts.h
+++ b/skia/animator/SkPathParts.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkPathParts.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkPostParts.cpp b/skia/animator/SkPostParts.cpp
index b1469fc..254b17d 100644
--- a/skia/animator/SkPostParts.cpp
+++ b/skia/animator/SkPostParts.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkPostParts.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkPostParts.h b/skia/animator/SkPostParts.h
index f02b4b0..ef41fe5 100644
--- a/skia/animator/SkPostParts.h
+++ b/skia/animator/SkPostParts.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkPostParts.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkSVGPath.cpp b/skia/animator/SkSVGPath.cpp
index e1c83c0..86eeee8 100644
--- a/skia/animator/SkSVGPath.cpp
+++ b/skia/animator/SkSVGPath.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkSVGPath.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkScript.cpp b/skia/animator/SkScript.cpp
index c6c9b73..3b67d7b 100644
--- a/skia/animator/SkScript.cpp
+++ b/skia/animator/SkScript.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkScript.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkScript.h b/skia/animator/SkScript.h
index ca095ba..bb7d9782 100644
--- a/skia/animator/SkScript.h
+++ b/skia/animator/SkScript.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkScript.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkScriptDecompile.cpp b/skia/animator/SkScriptDecompile.cpp
index 22bd7b4..d582d33 100644
--- a/skia/animator/SkScriptDecompile.cpp
+++ b/skia/animator/SkScriptDecompile.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkScriptDecompile.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkSnapshot.cpp b/skia/animator/SkSnapshot.cpp
index 0b331f5..b65c517 100644
--- a/skia/animator/SkSnapshot.cpp
+++ b/skia/animator/SkSnapshot.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkSnapshot.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkSnapshot.h b/skia/animator/SkSnapshot.h
index b63145d..c459fbb 100644
--- a/skia/animator/SkSnapshot.h
+++ b/skia/animator/SkSnapshot.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkSnapshot.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkTDArray_Experimental.h b/skia/animator/SkTDArray_Experimental.h
index c59f670..94d78711 100644
--- a/skia/animator/SkTDArray_Experimental.h
+++ b/skia/animator/SkTDArray_Experimental.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkTDArray_Experimental.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkTextOnPath.cpp b/skia/animator/SkTextOnPath.cpp
index af0eb4c..1a06746 100644
--- a/skia/animator/SkTextOnPath.cpp
+++ b/skia/animator/SkTextOnPath.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkTextOnPath.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkTextOnPath.h b/skia/animator/SkTextOnPath.h
index f01e118..3c78b5b 100644
--- a/skia/animator/SkTextOnPath.h
+++ b/skia/animator/SkTextOnPath.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkTextOnPath.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkTextToPath.cpp b/skia/animator/SkTextToPath.cpp
index 2a3fa8d..44036a3 100644
--- a/skia/animator/SkTextToPath.cpp
+++ b/skia/animator/SkTextToPath.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkTextToPath.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkTextToPath.h b/skia/animator/SkTextToPath.h
index 2ba41cf..6d93239 100644
--- a/skia/animator/SkTextToPath.h
+++ b/skia/animator/SkTextToPath.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkTextToPath.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkTime.cpp b/skia/animator/SkTime.cpp
index de091fe..a36a95a 100644
--- a/skia/animator/SkTime.cpp
+++ b/skia/animator/SkTime.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkTime.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkTypedArray.cpp b/skia/animator/SkTypedArray.cpp
index fb5ba2c..075c607 100644
--- a/skia/animator/SkTypedArray.cpp
+++ b/skia/animator/SkTypedArray.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkTypedArray.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkTypedArray.h b/skia/animator/SkTypedArray.h
index 0535426..a658f29 100644
--- a/skia/animator/SkTypedArray.h
+++ b/skia/animator/SkTypedArray.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkTypedArray.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkXMLAnimatorWriter.cpp b/skia/animator/SkXMLAnimatorWriter.cpp
index 86a43a1..b26bc733 100644
--- a/skia/animator/SkXMLAnimatorWriter.cpp
+++ b/skia/animator/SkXMLAnimatorWriter.cpp
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkXMLAnimatorWriter.cpp
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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. 
diff --git a/skia/animator/SkXMLAnimatorWriter.h b/skia/animator/SkXMLAnimatorWriter.h
index cc02b1c..c5830cd 100644
--- a/skia/animator/SkXMLAnimatorWriter.h
+++ b/skia/animator/SkXMLAnimatorWriter.h
@@ -1,6 +1,6 @@
 /* libs/graphics/animator/SkXMLAnimatorWriter.h
 **
-** Copyright 2006, Google Inc.
+** Copyright 2006, 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.