forked from qt-creator/qt-creator
Conflicts: src/plugins/android/androiddeployqtstep.cpp Change-Id: Id624bad384050d567efba0700046331086cb12dd
Conflicts: src/plugins/android/androiddeployqtstep.cpp Change-Id: Id624bad384050d567efba0700046331086cb12dd