-
Liang Qi authored
Conflicts: .qmake.conf doc/src/platforms/android-platform-notes.qdoc Change-Id: I2cc9f09464368a28879d5d755d1079d5f461edb5
2f81a81a
Conflicts: .qmake.conf doc/src/platforms/android-platform-notes.qdoc Change-Id: I2cc9f09464368a28879d5d755d1079d5f461edb5