Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android

framework/res/xml/phonegap.xml

@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phonegap>
-    <access origin="http://127.0.0.1*"/>
+	<!--  
+	access elements control the Android whitelist.  
+	Domains are assumed blocked unless set otherwise
+	 -->
+
+    <access origin="http://127.0.0.1*"/> <!-- allow local pages -->
+
+	<!-- <access origin="https://example.com" /> allow any secure requests to example.com -->
+	<!-- <access origin="https://example.com" subdomains="true" /> such as above, but including subdomains, such as www -->
+	<!-- <access origin=".*"/> Allow all domains, suggested development use only -->
+
     <log level="DEBUG"/>
     <preference name="classicRender" value="true" />
 </phonegap>
+
+
+

framework/res/xml/plugins.xml

@@ -16,5 +16,4 @@
     <plugin name="FileTransfer" value="com.phonegap.FileTransfer"/>
     <plugin name="Capture" value="com.phonegap.Capture"/>
     <plugin name="Battery" value="com.phonegap.BatteryListener"/>
-    <plugin name="Keyboard" value="com.phonegap.KeyboardHandler" />
 </plugins>