commit a0c480bf52d0495315abbaaa425dff43bd6c3b4a
author Roland Levillain <rpl@google.com> Fri Dec 18 23:10:34 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 18 23:10:34 2015 +0000
tree a29f388878f303b866166bf8256d5452377a2ddd
parent 504f0caed8f08b59a4673c7bad91231caa4eb0a3
parent 579168768e85aad19f5ae5101542a9963f6f0e4c

Merge "Disable jsr166.LinkedTransferQueueTest#testTransfer2 again." am: 9d9435ff95
am: 579168768e

* commit '579168768e85aad19f5ae5101542a9963f6f0e4c':
  Disable jsr166.LinkedTransferQueueTest#testTransfer2 again.

tools/libcore_failures.txt

diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt
index a5476f7..b323456 100644
--- a/tools/libcore_failures.txt
+++ b/tools/libcore_failures.txt
@@ -170,5 +170,11 @@
   result: EXEC_FAILED,
   names: ["org.apache.harmony.tests.java.util.WeakHashMapTest#test_keySet"],
   bug: 25437292
+},
+{
+  description: "Assertion failing on the concurrent collector configuration.",
+  result: EXEC_FAILED,
+  names: ["jsr166.LinkedTransferQueueTest#testTransfer2"],
+  bug: 25883050
 }
 ]