diff options
author | Brian Carlstrom <bdc@google.com> | 2014-05-08 14:31:57 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2014-05-08 14:34:30 -0700 |
commit | 7284903a38c1e583f1fe003a8339338e8e867156 (patch) | |
tree | cea09bd2fea365c1bac333e4bb3ae08336150a6d /expectations/brokentests.txt | |
parent | bdb8ddc00646e5121c91465de1d49263cc69bc4d (diff) | |
parent | 55c2222369e96b2ce6eb23e70fcf59dd2c51cc5c (diff) | |
download | libcore-7284903a38c1e583f1fe003a8339338e8e867156.zip libcore-7284903a38c1e583f1fe003a8339338e8e867156.tar.gz libcore-7284903a38c1e583f1fe003a8339338e8e867156.tar.bz2 |
resolved conflicts for merge of 55c22223 to master
Change-Id: Ie6b363f2fcee69aa71f96fbab2d4179633f6f683
Diffstat (limited to 'expectations/brokentests.txt')
-rw-r--r-- | expectations/brokentests.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/expectations/brokentests.txt b/expectations/brokentests.txt index e722427..2a2e4c3 100644 --- a/expectations/brokentests.txt +++ b/expectations/brokentests.txt @@ -949,5 +949,13 @@ names: [ "org.apache.harmony.tests.java.lang.reflect.GenericSignatureFormatErrorTest#test_signatureFormatError" ] +}, +{ + description: "The ResourceBundle code under test is probably not used much on Android and needs a lot of attention.", + bug: 13747957, + result: EXEC_FAILED, + names: [ + "org.apache.harmony.tests.java.util.ControlTest#test_needsReload_LStringLLocaleLStringLClassLoaderResourceBundleJ" + ] } ] |