mirror of
https://github.com/apache/cordova-android.git
synced 2025-01-31 17:32:51 +08:00
f38c460588
Conflicts: test/src/org/apache/cordova/test/junit/GapClientTest.java test/src/org/apache/cordova/test/userwebview.java test/src/org/apache/cordova/test/whitelist.java |
||
---|---|---|
.. | ||
com/squareup/okhttp | ||
org/apache/cordova |