resolved conflicts for merge of a5b9e3eb to honeycomb-mr1
Change-Id: Ibb83d18811099872fa30c2ee6cb90a3fd5f8e163
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"
]