commit 1fef6339b35c7c5e18ec4122fc3019a13cba542a
author Brian Muramatsu <btmura@google.com> Mon Apr 18 03:08:23 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 18 03:08:23 2011 -0700
tree f412364c413e39abb276027c8f22c8c7d7ffc4c9
parent 04a0d1beaf1eab015cf47afbde3edeb2f1a3bdad
parent cd49b84b2cbfc105d0c97fbff81ea3c7aac4c289

am cd49b84b: resolved conflicts for merge of a5b9e3eb to honeycomb-mr1

* commit 'cd49b84b2cbfc105d0c97fbff81ea3c7aac4c289':
  Suppress GestureDetectorTest

tests/expectations/knownfailures-3.0_r1.txt

diff --git a/tests/expectations/knownfailures-3.0_r1.txt b/tests/expectations/knownfailures-3.0_r1.txt
index 405729d..a13d081 100644
--- a/tests/expectations/knownfailures-3.0_r1.txt
+++ b/tests/expectations/knownfailures-3.0_r1.txt
@@ -28,6 +28,8 @@
   description: "Flakey",
   names: [
     "android.hardware.cts.CameraTest#testSetPreviewDisplay",
+    "android.view.cts.GestureDetectorTest#testOnTouchEvent",
+    "android.view.cts.ViewTest#testWindowVisibilityChanged",
     "android.webkit.cts.WebChromeClientTest#testOnReceivedIcon",
     "android.widget.cts.AbsListViewTest#testGetContextMenuInfo"
   ]