mirror of
https://github.com/apache/cordova-android.git
synced 2025-01-31 09:02:50 +08:00
18fd54b9c0
Merge branch 'master' of git://github.com/sintaxi/phonegap Conflicts: android/src/com/android/droidgap/DroidGap.java |
||
---|---|---|
res | ||
src/com/nitobi/phonegap | ||
.classpath | ||
.project | ||
AndroidManifest.xml |