commit 9bebe31160109ffec448bb45a875b363f78f35ec
author Adam Powell <adamp@google.com> Fri Sep 17 14:56:25 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 17 14:56:25 2010 -0700
tree 5da2aa90635db6c0e2801e1b25a2c09a68355856
parent f8648cd437d47b0f3c7d404cb87582dba458e6c4
parent 346c507f0be9b40d77f656fd5a548ba7bba1f342

am 346c507f: Merge "Updated for framework API changes" into gingerbread

Merge commit '346c507f0be9b40d77f656fd5a548ba7bba1f342' into gingerbread-plus-aosp

* commit '346c507f0be9b40d77f656fd5a548ba7bba1f342':
  Updated for framework API changes

tests/tests/view/src/android/view/cts/ViewTest.java

diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index 77624e8..3168312 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -4655,6 +4655,10 @@
             mHasChildDrawableStateChanged = false;
             mHasBroughtChildToFront = false;
         }
+
+        public void childOverlayStateChanged(View child) {
+
+        }
     }
 
     private final class OnCreateContextMenuListenerImpl implements OnCreateContextMenuListener {