commit 7c5c499f87e2ae7d26a1fe34e6c1b67a16ec7a3e
author Nicholas Sauer <nicksauer@google.com> Wed May 07 23:45:49 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 07 23:45:49 2014 +0000
tree 2b888f3f867b1d5130845e9e11b43eb7465c80b9
parent 6403eac9ea2b3e713b61d5d7c8af43ca33927f82
parent 598eb3c27478d7e8eab317550c5ff3595ea5f304

am 598eb3c2: DO NOT MERGE Add a knownfailure entry for testAvcBaseline12.

* commit '598eb3c27478d7e8eab317550c5ff3595ea5f304':
  DO NOT MERGE Add a knownfailure entry for testAvcBaseline12.

tests/expectations/knownfailures.txt

diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index 2fb3b75..e226ead 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -76,6 +76,10 @@
   {
     name: "android.provider.cts.CalendarTest#testEventColors",
     bug: 8241711
+  },
+  {
+    name: "android.media.cts.MediaCodecCapabilitiesTest#testAvcBaseline12",
+    bug: 14323112
   }
 ]