diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-12 10:33:07 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-12 10:33:07 +0100 |
| commit | 2b6c9f5506aaa53cf7003585077a9b9b57bd685b (patch) | |
| tree | 9a66fba8929f8c89e8809a3c8234fb0f40d069f3 /expectations/knownfailures.txt | |
| parent | 7da043857a3fd73aa06256b6a6199fc8f42baffa (diff) | |
| parent | e111e5a4325c29d18c709601ffa95bf6163fda89 (diff) | |
| download | libcore-2b6c9f5506aaa53cf7003585077a9b9b57bd685b.zip libcore-2b6c9f5506aaa53cf7003585077a9b9b57bd685b.tar.gz libcore-2b6c9f5506aaa53cf7003585077a9b9b57bd685b.tar.bz2 | |
resolved conflicts for merge of e111e5a4 to klp-modular-dev-plus-aosp
Change-Id: Iaf9c22378a35a0bd2d9e20c6afeb208c468234ab
Diffstat (limited to 'expectations/knownfailures.txt')
| -rw-r--r-- | expectations/knownfailures.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt index 76a9801..e0b1acd 100644 --- a/expectations/knownfailures.txt +++ b/expectations/knownfailures.txt @@ -1690,5 +1690,10 @@ "org.apache.harmony.tests.java.net.MulticastSocketTest#test_setLoopbackModeSendReceive_IPv4", "org.apache.harmony.tests.java.net.MulticastSocketTest#test_setLoopbackModeSendReceive_IPv6" ] +}, +{ + description: "Known failure in GregorianCalendarTest", + bug: 12778197, + name: "org.apache.harmony.tests.java.util.GregorianCalendarTest#test_computeTime" } ] |