mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-01 02:12:58 +08:00
4ca2305693
Conflicts: framework/src/org/apache/cordova/CordovaChromeClient.java framework/src/org/apache/cordova/CordovaUriHelper.java framework/src/org/apache/cordova/CordovaWebView.java framework/src/org/apache/cordova/CordovaWebViewClient.java framework/src/org/apache/cordova/ExposedJsApi.java framework/src/org/apache/cordova/NativeToJsMessageQueue.java framework/src/org/apache/cordova/PluginManager.java |
||
---|---|---|
.. | ||
com/squareup/okhttp | ||
org/apache/cordova |