forked from qt-creator/qt-creator
Conflicts: src/plugins/android/androidbuildapkstep.cpp Change-Id: Id6dfda480c23706089ab38aa6277cd37599b5167
Conflicts: src/plugins/android/androidbuildapkstep.cpp Change-Id: Id6dfda480c23706089ab38aa6277cd37599b5167