am cc99e0de: am 1f831156: Merge "Revert "Add android.hardware.cts.SensorTest#testBatchAndFlush to knownfailures"" into lollipop-mr1-cts-dev

* commit 'cc99e0de5806d7fc72b2ed58cd21b097fd7612bd':
  Revert "Add android.hardware.cts.SensorTest#testBatchAndFlush to knownfailures"
diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index d4b1a35..76b528b 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -313,13 +313,6 @@
   bug: 17675466
 },
 {
-  description: "tests will soon become mandatory",
-  names: [
-    "android.hardware.cts.SensorTest#testBatchAndFlush"
-  ],
-  bug: 18958411
-},
-{
   description: "This test failed on hw decoder that doesn't output frame with the configured format.",
   names: [
     "android.media.cts.ImageReaderDecoderTest#testHwAVCDecode360pForFlexibleYuv"