forked from qt-creator/qt-creator
Conflicts: src/plugins/android/androiddeployqtstep.cpp src/plugins/debugger/debuggerdialogs.cpp src/plugins/projectexplorer/kitaspect.cpp Change-Id: Iebc1d7a38db4c228282c04c63d7f11ee76072a06
Conflicts: src/plugins/android/androiddeployqtstep.cpp src/plugins/debugger/debuggerdialogs.cpp src/plugins/projectexplorer/kitaspect.cpp Change-Id: Iebc1d7a38db4c228282c04c63d7f11ee76072a06