Ian Clelland dd5a337a49 Merge branch 'master' into 4.0.x ...

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

2014-09-11 10:18:35 -04:00

..

com/squareup/okhttp

CB-6818: I want to remove this code, because Square didn't do their headers properly

2014-06-03 15:22:10 -07:00

org/apache/cordova

Merge branch 'master' into 4.0.x

2014-09-11 10:18:35 -04:00