commit 722665c5f76e81bed646490977ea30f38aaa00da
author Mathias Agopian <mathias@google.com> Mon Oct 04 20:18:51 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 04 20:18:51 2010 -0700
tree 99deb5d8c43a5b4be0b97b132219ba87c50bc21e
parent bba3b8efbe7dc9dd6fa326103ef7ddefc28d5ba5
parent ef11530874f86570aa04a10c16a416b274b3fdf5

am ef115308: fix build. SurfaceView.setFrame needed to be hidden

Merge commit 'ef11530874f86570aa04a10c16a416b274b3fdf5' into gingerbread-plus-aosp

* commit 'ef11530874f86570aa04a10c16a416b274b3fdf5':
  fix build. SurfaceView.setFrame needed to be hidden

core/java/android/view/SurfaceView.java

diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index a3d6049..b45aa99 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -287,6 +287,7 @@
         setMeasuredDimension(width, height);
     }
     
+    /** @hide */
     @Override
     protected boolean setFrame(int left, int top, int right, int bottom) {
         boolean result = super.setFrame(left, top, right, bottom);