commit cd49b84b2cbfc105d0c97fbff81ea3c7aac4c289
author Brian Muramatsu <btmura@google.com> Fri Apr 15 14:36:46 2011 -0700
committer Brian Muramatsu <btmura@google.com> Fri Apr 15 14:36:46 2011 -0700
tree f412364c413e39abb276027c8f22c8c7d7ffc4c9
parent bbcc4ed4934a8b2faae5eabcb96fb6816de9b03c
parent a5b9e3ebc2c6d800c53325df9e0ad55a6608ae94

resolved conflicts for merge of a5b9e3eb to honeycomb-mr1

Change-Id: Ibb83d18811099872fa30c2ee6cb90a3fd5f8e163

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"
   ]