Andrew Grieve c352b296da Merge branch 'master' into 4.0.x (gradlify tests) ... Conflicts: test/androidTest/src/org/apache/cordova/test/junit/MenuTest.java		2015-01-20 14:55:44 -05:00
..
cordova	Merge branch 'master' into 4.0.x (gradle fixes)	2015-01-19 22:04:10 -05:00
project	Merge branch 'master' into 4.0.x (gradlify tests)	2015-01-20 14:55:44 -05:00