Merge branch 'master' of github.com:phonegap/phonegap-android

framework/src/com/phonegap/FileUtils.java

@@ -175,6 +175,7 @@ public class FileUtils extends Plugin {
    		String line;
    		while ((line = reader.readLine()) != null) {
    			data.append(line);
+   			data.append('\n');
    		}
     	return data.toString();
     }

framework/src/com/phonegap/api/PluginResult.java

@@ -22,7 +22,7 @@ public class PluginResult {
 	
 	public PluginResult(Status status, String message) {
 		this.status = status.ordinal();
-		this.message = "'" + message + "'";
+		this.message = JSONObject.quote(message);
 	}
 
 	public PluginResult(Status status, JSONArray message) {