From: Maria Guseva Date: Tue, 28 Jun 2016 05:40:18 +0000 (+0300) Subject: SRADA-848: Merge branch 'dev_cli' into sdk_merge (1) X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23d48071c5f51f8d977f1b34b6ef41665961efdf;p=sdk%2Ftools%2Fdynamic-analyzer.git SRADA-848: Merge branch 'dev_cli' into sdk_merge (1) Merged with dev_cli changes before DA re-design commits were applied. dev_cli HEAD commit: 886559b071470128a56d94cefa33bf2deaca9988 Change-Id: Ic30dac859e48dad042c5e220e7e8f5efdbabb572 --- 23d48071c5f51f8d977f1b34b6ef41665961efdf diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java index eaa72a1,5ab6b8d..5ab6b8d mode 100644,100755..100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java index 93de392,6412689..9fc6971 mode 100644,100755..100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DeviceManager.java index e5bd7d7,30cb192..28c6bed mode 100644,100755..100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DeviceManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DeviceManager.java