Merge "Fix the build."

2011-04-28 19:42:56 -07:00
parent 9b4bee0f14 e208fc2f5b
commit 522aca1fbc
1 changed files with 0 additions and 3 deletions
--- a/core/java/android/view/TextureView.java
+++ b/core/java/android/view/TextureView.java
@@ -47,7 +47,6 @@ import android.util.Log;
 *      private Camera mCamera;
 *      private TextureView mTextureView;
 *
- *      @Override
 *      protected void onCreate(Bundle savedInstanceState) {
 *          super.onCreate(savedInstanceState);
 *
@@ -57,7 +56,6 @@ import android.util.Log;
 *          setContentView(mTextureView);
 *      }
 *
- *      @Override
 *      protected void onDestroy() {
 *          super.onDestroy();
 *
@@ -65,7 +63,6 @@ import android.util.Log;
 *          mCamera.release();
 *      }
 *
- *      @Override
 *      public void onSurfaceTextureAvailable(SurfaceTexture surface) {
 *          mCamera = Camera.open();
 *