Merge branch 'master' into StudioProjectCompat

bin/templates/cordova/lib/builders/GenericBuilder.js

@@ -73,7 +73,7 @@ function findOutputApksHelper (dir, build_type, arch) {
     var shellSilent = shell.config.silent;
     shell.config.silent = true;
 
-    var ret = shell.ls(path.join(dir, '*.apk')).filter(function (candidate) {
+    var ret = shell.ls(path.join(dir, build_type, '*.apk')).filter(function (candidate) {
         var apkName = path.basename(candidate);
         // Need to choose between release and debug .apk.
         if (build_type === 'debug') {

bin/templates/cordova/version

@@ -20,7 +20,7 @@
 */
 
 // Coho updates this line:
-var VERSION = "6.4.0-dev";
+var VERSION = "6.5.0-dev";
 
 module.exports.version = VERSION;