diff --git a/pom.xml b/pom.xml
index 1dd27df..1d5c659 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2009 Google Inc.
+Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/clippy/Clippy.gwt.xml b/src/main/java/com/google/gwtexpui/clippy/Clippy.gwt.xml
index f211033..b5d4a16 100644
--- a/src/main/java/com/google/gwtexpui/clippy/Clippy.gwt.xml
+++ b/src/main/java/com/google/gwtexpui/clippy/Clippy.gwt.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2009 Google Inc.
+ Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java b/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java
index 46f83e3..d0f32e4 100644
--- a/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java
+++ b/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabel.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/progress/Progress.gwt.xml b/src/main/java/com/google/gwtexpui/progress/Progress.gwt.xml
index 7c5d832..e878c4c 100644
--- a/src/main/java/com/google/gwtexpui/progress/Progress.gwt.xml
+++ b/src/main/java/com/google/gwtexpui/progress/Progress.gwt.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2009 Google Inc.
+ Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java b/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java
index 3028cbf..1d37711 100644
--- a/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java
+++ b/src/main/java/com/google/gwtexpui/progress/client/ProgressBar.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/safehtml/SafeHtml.gwt.xml b/src/main/java/com/google/gwtexpui/safehtml/SafeHtml.gwt.xml
index 6ffef93..3d5d5d8 100644
--- a/src/main/java/com/google/gwtexpui/safehtml/SafeHtml.gwt.xml
+++ b/src/main/java/com/google/gwtexpui/safehtml/SafeHtml.gwt.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2009 Google Inc.
+ Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java b/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java
index be8c72d..46d7f51 100644
--- a/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java
+++ b/src/main/java/com/google/gwtexpui/safehtml/client/AttMap.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/safehtml/client/Buffer.java b/src/main/java/com/google/gwtexpui/safehtml/client/Buffer.java
index 04c9252..d79c580 100644
--- a/src/main/java/com/google/gwtexpui/safehtml/client/Buffer.java
+++ b/src/main/java/com/google/gwtexpui/safehtml/client/Buffer.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java b/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java
index bc7d39b..a1801ad 100644
--- a/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java
+++ b/src/main/java/com/google/gwtexpui/safehtml/client/BufferDirect.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java b/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java
index 12165fe..6b5346d 100644
--- a/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java
+++ b/src/main/java/com/google/gwtexpui/safehtml/client/BufferSealElement.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java b/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java
index 758a215..303bc5b 100644
--- a/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java
+++ b/src/main/java/com/google/gwtexpui/safehtml/client/HighlightSuggestOracle.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java b/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
index 0a7505a..1e4da6e 100644
--- a/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
+++ b/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java b/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java
index 238a102..2afba70 100644
--- a/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java
+++ b/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilder.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java b/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java
index 4d500fe..c037c6f 100644
--- a/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java
+++ b/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtmlString.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/server/CacheControlFilter.java b/src/main/java/com/google/gwtexpui/server/CacheControlFilter.java
index dde2cac..228495d 100644
--- a/src/main/java/com/google/gwtexpui/server/CacheControlFilter.java
+++ b/src/main/java/com/google/gwtexpui/server/CacheControlFilter.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 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/src/main/java/com/google/gwtexpui/user/User.gwt.xml b/src/main/java/com/google/gwtexpui/user/User.gwt.xml
index 8736beb..4ebdca4 100644
--- a/src/main/java/com/google/gwtexpui/user/User.gwt.xml
+++ b/src/main/java/com/google/gwtexpui/user/User.gwt.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2009 Google Inc.
+ Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/user/client/AutoCenterDialogBox.java b/src/main/java/com/google/gwtexpui/user/client/AutoCenterDialogBox.java
index 6da131c..2b6e1bf 100644
--- a/src/main/java/com/google/gwtexpui/user/client/AutoCenterDialogBox.java
+++ b/src/main/java/com/google/gwtexpui/user/client/AutoCenterDialogBox.java
@@ -1,4 +1,4 @@
-// Copyright 2008 Google Inc.
+// Copyright (C) 2008 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/src/main/java/com/google/gwtexpui/user/client/FocusPanelFactory.java b/src/main/java/com/google/gwtexpui/user/client/FocusPanelFactory.java
index 90f1412..37df7a0 100644
--- a/src/main/java/com/google/gwtexpui/user/client/FocusPanelFactory.java
+++ b/src/main/java/com/google/gwtexpui/user/client/FocusPanelFactory.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/user/client/FocusPanelFactorySafari.java b/src/main/java/com/google/gwtexpui/user/client/FocusPanelFactorySafari.java
index b9cb180..7b77426 100644
--- a/src/main/java/com/google/gwtexpui/user/client/FocusPanelFactorySafari.java
+++ b/src/main/java/com/google/gwtexpui/user/client/FocusPanelFactorySafari.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBox.java b/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBox.java
index 5c885cb..c6ab09a 100644
--- a/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBox.java
+++ b/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBox.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBoxImpl.java b/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBoxImpl.java
index bc68d95..a32fc99 100644
--- a/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBoxImpl.java
+++ b/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBoxImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBoxImplAutoHide.java b/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBoxImplAutoHide.java
index 7248fbf..e32fe78 100644
--- a/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBoxImplAutoHide.java
+++ b/src/main/java/com/google/gwtexpui/user/client/PluginSafeDialogBoxImplAutoHide.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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/src/main/java/com/google/gwtexpui/user/client/UserAgent.java b/src/main/java/com/google/gwtexpui/user/client/UserAgent.java
index ca7d913..dbe432c 100644
--- a/src/main/java/com/google/gwtexpui/user/client/UserAgent.java
+++ b/src/main/java/com/google/gwtexpui/user/client/UserAgent.java
@@ -1,4 +1,4 @@
-// Copyright 2009 Google Inc.
+// Copyright (C) 2009 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.