summaryrefslogtreecommitdiffstats
path: root/expectations/knownfailures.txt
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-05-26 11:13:22 +0100
committerNeil Fuller <nfuller@google.com>2015-05-26 11:21:07 +0100
commit97ae95e4223f64348bc5482ceea0928e1ec55404 (patch)
treeddbc8db5c641f7892db8c2e4c8e26a9afbfcf8a9 /expectations/knownfailures.txt
parent7b2d3c5e1d4b77085494c3696d4282858136d81e (diff)
parent72b26859227fde9de20825d6776ef9b26c42c194 (diff)
downloadlibcore-97ae95e4223f64348bc5482ceea0928e1ec55404.zip
libcore-97ae95e4223f64348bc5482ceea0928e1ec55404.tar.gz
libcore-97ae95e4223f64348bc5482ceea0928e1ec55404.tar.bz2
resolved conflicts for merge of 72b26859 to lmp-mr1-ub-dev
Change-Id: Id188dacbfd8e83fd884f838e392444890a231e5e
Diffstat (limited to 'expectations/knownfailures.txt')
-rw-r--r--expectations/knownfailures.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index c23deff..6470e36 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -1462,6 +1462,14 @@
]
},
{
+ description: "OkHttp tests that fail on Wear devices due to a lack of memory",
+ bug: 20055487,
+ names: [
+ "com.squareup.okhttp.internal.spdy.Http20Draft09Test#tooLargeDataFrame",
+ "com.squareup.okhttp.internal.spdy.Spdy3Test#tooLargeDataFrame"
+ ]
+},
+{
description: "libcore.java.text.DecimalFormatSymbolsTest#test_getInstance_unknown_or_invalid_locale assumes fallback to locale other than en_US_POSIX.",
bug: 17374604,
names: [