commit 9ab8a0713fb72a1ac6fe92ae7c229b2b9bef297b
author Steven Moreland <smoreland@google.com> Tue Oct 29 09:14:44 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 29 09:14:44 2019 -0700
tree b949b48971f114093083f6aaab66c5c1ff613482
parent cb8118a096c907247c11d3ff573d06ab5e9b8799
parent 2a6f6ed94b751214e59f585a1f84319becfad97f

Merge "ServiceManagerProxy: implement new method"
am: 2a6f6ed94b

Change-Id: Id8d345fbe03cefed512b7dbb567b384dd20468da

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"
                 }
             ]
         }