forked from qt-creator/qt-creator
Conflicts: src/plugins/android/androidextralibrarylistmodel.cpp Change-Id: Ica69c24e83deff819e640dcb4c2682a554d8a2d2
Conflicts: src/plugins/android/androidextralibrarylistmodel.cpp Change-Id: Ica69c24e83deff819e640dcb4c2682a554d8a2d2