Merge commit '9bd0272d004aabece70774113d1ff6d9dbf1301c' into HEAD

Test: check_build_sanity.py
Change-Id: I83a7e6b3626bcf5a51af5a4bfe49f727bd2c4da1

diff --cc framework/common/tcuApp.cpp
index 075d505,7c49f7f..d99617f
--- 1/framework/common/tcuApp.cpp
--- 2/framework/common/tcuApp.cpp
+++ b/framework/common/tcuApp.cpp
@@@ -204,15 -203,10 +204,15 @@@ bool App::iterate (void
        return platformOk && testExecOk;
  }
  
- void App::onWatchdogTimeout (qpWatchDog* watchDog, void* userPtr)
 +const TestRunStatus& App::getResult (void) const
 +{
 +      return m_testExecutor->getStatus();
 +}
 +
+ void App::onWatchdogTimeout (qpWatchDog* watchDog, void* userPtr, qpTimeoutReason reason)
  {
        DE_UNREF(watchDog);
-       static_cast<App*>(userPtr)->onWatchdogTimeout();
+       static_cast<App*>(userPtr)->onWatchdogTimeout(reason);
  }
  
  void App::onCrash (qpCrashHandler* crashHandler, void* userPtr)

diff --cc framework/common/tcuApp.hpp
Simple merge