Andrew Grieve fdef0db87c Merge branch 'master' into 4.0.x (Load timeout, bridge secret, content: URI) ...

Conflicts:
	framework/src/org/apache/cordova/CordovaWebView.java

2014-11-06 15:37:30 -05:00

..

cordova

Merge branch 'master' into 4.0.x (per-arch gradle builds)

2014-09-24 16:18:51 -04:00

project

Merge branch 'master' into 4.0.x (Load timeout, bridge secret, content: URI)

2014-11-06 15:37:30 -05:00