mirror of
https://github.com/apache/cordova-android.git
synced 2025-03-14 15:21:04 +08:00

Conflicts: bin/templates/project/custom_rules.xml framework/src/org/apache/cordova/CordovaWebView.java test/src/org/apache/cordova/test/junit/MessageTest.java