resolved conflicts for merge of 72b26859 to lmp-mr1-ub-dev
Change-Id: Id188dacbfd8e83fd884f838e392444890a231e5e
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: [