forked from github/cordova-android

Conflicts: bin/lib/check_reqs.js bin/lib/create.js bin/node_modules/which/package.json bin/templates/cordova/lib/build.js
Conflicts: bin/lib/check_reqs.js bin/lib/create.js bin/node_modules/which/package.json bin/templates/cordova/lib/build.js