diff options
| author | Neil Fuller <nfuller@google.com> | 2014-06-09 10:52:29 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-06-09 10:52:29 +0100 |
| commit | 2c437dcbdff19697a34c42f62fe269ce32399c2a (patch) | |
| tree | 24b0bf0139715a8d8c598841a156f703ba1cc86e /expectations | |
| parent | 02a6d16451fdebffb08fd115470084ea55ae08f0 (diff) | |
| parent | 7450e1e23f96732b33f0cc04a235357a5ceadf89 (diff) | |
| download | libcore-2c437dcbdff19697a34c42f62fe269ce32399c2a.zip libcore-2c437dcbdff19697a34c42f62fe269ce32399c2a.tar.gz libcore-2c437dcbdff19697a34c42f62fe269ce32399c2a.tar.bz2 | |
resolved conflicts for merge of 7450e1e2 to klp-modular-dev-plus-aosp
Change-Id: I1373b4ae460e940d61a6fd8ac3d5280df6bc14b0
Diffstat (limited to 'expectations')
| -rw-r--r-- | expectations/knownfailures.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt index 44a0155..0392a11 100644 --- a/expectations/knownfailures.txt +++ b/expectations/knownfailures.txt @@ -1506,10 +1506,5 @@ description: "Suppression of a test that proves there is a known bug with Matcher", bug: 14865710, name: "org.apache.harmony.tests.java.util.ScannerParseLargeFileBenchmarkTest#testParseLargeFile" -}, -{ - description: "Large test that ends in a timeout during CTS runs", - bug: 5513723, - name: "libcore.java.security.KeyPairGeneratorTest#test_getInstance" } ] |