commit 169bb42f38990546d3718d21a62867b857a5ab86
author Narayan Kamath <narayan@google.com> Tue Jul 28 16:59:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 28 16:59:26 2015 +0000
tree 42797be3f36d311a0d7b4353c93365f7d927cac1
parent 02c921a89942fc388cb0c47d60f1632ac3f27034
parent 82beb6c067fdcf7c34034f4db8b023e3221f8bf4

am 82beb6c0: am 1a4d013b: Merge "Temporarily suppress TimeZoneTest.testAllDisplayNames."

* commit '82beb6c067fdcf7c34034f4db8b023e3221f8bf4':
  Temporarily suppress TimeZoneTest.testAllDisplayNames.

tools/libcore_failures.txt

diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt
index 992a8a6..d58f034 100644
--- a/tools/libcore_failures.txt
+++ b/tools/libcore_failures.txt
@@ -150,5 +150,12 @@
   result: EXEC_FAILED,
   modes: [device],
   names: ["org.apache.harmony.tests.java.lang.ClassTest#test_forNameLjava_lang_String"]
+},
+{
+  description: "TimeZoneTest.testAllDisplayNames times out, needs investigation",
+  result: EXEC_FAILED,
+  modes: [device],
+  names: ["libcore.java.util.TimeZoneTest.testAllDisplayNames"],
+  bug: 22786792
 }
 ]