diff options
| author | 2011-04-28 19:42:56 -0700 | |
|---|---|---|
| committer | 2011-04-28 19:42:56 -0700 | |
| commit | 522aca1fbc4cd7449d892b56966ddbb12753472c (patch) | |
| tree | b63c5105e12e7d2d5eea172b8d65fd2b266fb643 | |
| parent | 9b4bee0f14bbd137b0797127aff2df46a6321ec5 (diff) | |
| parent | e208fc2f5b5bf44e418ea24336317174c9ff7ec5 (diff) | |
Merge "Fix the build."
| -rw-r--r-- | core/java/android/view/TextureView.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java index 5ece15cca7a8..6380e1b5c7bd 100644 --- 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(); * |