projects
/
sdk
/
tools
/
dynamic-analyzer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f2fbbd7
886559b
)
SRADA-848: Merge branch 'dev_cli' into sdk_merge (1)
author
Maria Guseva
<m.guseva@samsung.com>
Tue, 28 Jun 2016 05:40:18 +0000
(08:40 +0300)
committer
Maria Guseva
<m.guseva@samsung.com>
Tue, 28 Jun 2016 08:48:53 +0000
(11:48 +0300)
Merged with dev_cli changes before DA re-design commits were applied.
dev_cli HEAD commit:
886559b071470128a56d94cefa33bf2deaca9988
Change-Id: Ic30dac859e48dad042c5e220e7e8f5efdbabb572
1
2
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java
patch
|
diff1
|
diff2
|
blob
|
history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
patch
|
diff1
|
diff2
|
blob
|
history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DeviceManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java
index
eaa72a1
,
5ab6b8d
..
5ab6b8d
mode 100644,100755..100644
---
1
/
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java
---
2
/
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
---
1
/
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
---
2
/
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
---
1
/
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DeviceManager.java
---
2
/
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DeviceManager.java
+++ b/
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DeviceManager.java