Skip to content

Commit

Permalink
Merge remote-tracking branch 'yschimke/httpengine' into httpengine
Browse files Browse the repository at this point in the history
# Conflicts:
#	integration_tests/ctesque/src/sharedTest/java/android/net/http/HttpEngineTest.java
  • Loading branch information
yschimke committed Apr 10, 2024
2 parents 809501d + 8f3fc0b commit d56f75e
Showing 1 changed file with 1 addition and 0 deletions.
Expand Up @@ -10,6 +10,7 @@

import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
Expand Down

0 comments on commit d56f75e

Please sign in to comment.