return proper os for devices

Author: SrinivasanTarget

src/main/java/com/thoughtworks/android/AndroidManager.java

@@ -71,6 +71,7 @@ public JSONObject getDeviceInfo(String deviceID) throws InterruptedException, IO
         adbDevices.put("deviceModel", deviceModel);
         adbDevices.put("screenSize", getScreenResolution);
         adbDevices.put("deviceManufacturer",deviceOrEmulator);
+        adbDevices.put("os", "android");
         return adbDevices;
     }
 
@@ -145,4 +146,4 @@ public int getPid(Process process) {
             return -1;
         }
     }
-}
+}

src/main/java/com/thoughtworks/iOS/IOSManager.java

@@ -67,6 +67,7 @@ private JSONObject getDeviceInfo(String udid) throws InterruptedException, IOExc
         iOSDevices.put("screenSize","Not Supported");
         iOSDevices.put("apiLevel","");
         iOSDevices.put("osVersion",osVersion);
+        iOSDevices.put("os", "ios");
         return iOSDevices;
     }