Conflicts:
	framework/assets/js/cordova.android.js
This commit is contained in:
Simon MacDonald
2012-10-24 16:32:01 -04:00
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -39,7 +39,7 @@ import android.telephony.TelephonyManager;
public class Device extends CordovaPlugin {
public static final String TAG = "Device";
public static String cordovaVersion = "2.2.0rc1"; // Cordova version
public static String cordovaVersion = "2.2.0rc2"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID