Merge remote-tracking branch 'origin/4.7'

Change-Id: Ib288796892faf5345d2a150a5ce0dadf91552924

src/plugins/android/androidrunconfiguration.cpp

@@ -115,6 +115,7 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Core::Id id)
     amStartArgsAspect->setSettingsKey("Android.AmStartArgsKey");
     amStartArgsAspect->setLabelText(tr("Activity manager start options:"));
     amStartArgsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
+    amStartArgsAspect->setHistoryCompleter("Android.AmStartArgs.History");
     addExtraAspect(amStartArgsAspect);
 
     auto preStartShellCmdAspect = new BaseStringListAspect(this);

src/plugins/android/androidrunnerworker.cpp

@@ -422,7 +422,7 @@ void AndroidRunnerWorker::asyncStartHelper()
         runAdb(removeForward);
         if (!runAdb({"forward", port, port})) {
             emit remoteProcessFinished(tr("Failed to forward QML debugging ports. Reason: %1.")
-                                       .arg(m_lastRunAdbError));
+                                       .arg(m_lastRunAdbError) + "\n" + m_lastRunAdbRawOutput);
             return;
         }
         m_afterFinishAdbCommands.push_back(removeForward.join(' '));