Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a13d4e3 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am f5c73101: Merge "dependent change for "parse instrumentation result bundles" in sdk"

Merge commit 'f5c73101' into gingerbread-plus-aosp

* commit 'f5c73101':
  dependent change for "parse instrumentation result bundles" in sdk
parents 5b0f030d f5c73101
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.lang.Runtime;
import java.lang.Process;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

@@ -468,7 +469,7 @@ public class PackageManagerHostTestUtils extends Assert {
            mAllTestsPassed = false;
        }

        public void testRunEnded(long elapsedTime) {
        public void testRunEnded(long elapsedTime, Map<String, String> resultBundle) {
            // ignore
        }