Andrew Grieve f086ef5cad Merge branch 'master' into 4.0.x (adb CWD & build --unknown-flag) ...

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

2014-12-11 13:47:07 -05: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 (adb CWD & build --unknown-flag)

2014-12-11 13:47:07 -05:00