forked from qt-creator/qt-creator
Conflicts: src/plugins/android/androiddevice.h src/plugins/android/androidplugin.cpp src/plugins/android/androidplugin.h Change-Id: I1a68354415283fe4a7450706520a576d2a1775e0
See ../../../doc/src/editors/creator-only/creator-clang-codemodel.qdoc