commit 614b2ca5ef77b2312ab5c628d48371d85b74fb90
author Jack Yu <jackyu@google.com> Mon Oct 28 15:26:01 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 28 15:26:01 2019 -0700
tree b624f744cd1ef21c86bb80621935cf795ab001e7
parent a0b42289aa198094576cf799095d8f40615a218a
parent 48ad8828d132e3a9ef4a60fa2b2528538b27e91d

Merge "Add new carrier configuration for GET INPUT command"
am: 48ad8828d1

Change-Id: Ib9dc938b2dcaa069fdca20f72c9eacb7d60356c7

services/core/java/com/android/server/audio/TEST_MAPPING

diff --git a/services/core/java/com/android/server/audio/TEST_MAPPING b/services/core/java/com/android/server/audio/TEST_MAPPING
index bf09eac..0d34c53 100644
--- a/services/core/java/com/android/server/audio/TEST_MAPPING
+++ b/services/core/java/com/android/server/audio/TEST_MAPPING
@@ -8,9 +8,6 @@
                 },
                 {
                     "include-filter": "android.media.cts.AudioFocusTest"
-                },
-                {
-                    "exclude-annotation": "androidx.test.filters.FlakyTest"
                 }
             ]
         }