diff --git a/CameraPreviewTest/src/com/example/android/videochatcameratest/CameraPreviewView.java b/CameraPreviewTest/src/com/example/android/videochatcameratest/CameraPreviewView.java
index 24f6133..78fdeec 100644
--- a/CameraPreviewTest/src/com/example/android/videochatcameratest/CameraPreviewView.java
+++ b/CameraPreviewTest/src/com/example/android/videochatcameratest/CameraPreviewView.java
@@ -1,18 +1,5 @@
-/*
- * Copyright (C) 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 2010 Google Inc.
+// All Rights Reserved.
 
 package com.example.android.videochatcameratest;
 
@@ -21,10 +8,6 @@
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-/**
- * @author mdodd@google.com (Your Name Here)
- *
- */
 public class CameraPreviewView extends SurfaceView implements SurfaceHolder.Callback {
     public SurfaceHolder mHolder;
 
diff --git a/CameraPreviewTest/src/com/example/android/videochatcameratest/VideoChatTestActivity.java b/CameraPreviewTest/src/com/example/android/videochatcameratest/VideoChatTestActivity.java
index e638192..92e2fc3 100644
--- a/CameraPreviewTest/src/com/example/android/videochatcameratest/VideoChatTestActivity.java
+++ b/CameraPreviewTest/src/com/example/android/videochatcameratest/VideoChatTestActivity.java
@@ -1,18 +1,5 @@
-/*
- * Copyright (C) 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 2010 Google Inc.
+// All Rights Reserved.
 
 package com.example.android.videochatcameratest;
 
@@ -39,11 +26,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * This class provides a basic demonstration of how to write an Android
- * activity. Inside of its window, it places a single view: an EditText that
- * displays and edits some internal text.
- */
 public class VideoChatTestActivity extends Activity {
 
     static final private int NUM_CAMERA_PREVIEW_BUFFERS = 2;