Merge remote-tracking branch 'suprem/sdk_merge' into 'origin/sdk'
authorGihun Chang <gihun.chang@samsung.com>
Mon, 22 Aug 2016 09:43:42 +0000 (18:43 +0900)
committerGihun Chang <gihun.chang@samsung.com>
Mon, 22 Aug 2016 09:56:18 +0000 (18:56 +0900)
commitdce355d37a967d8c86bb24f41b655cb29234fb91
tree0e66869bf8d82c27557bb491b0b73553efea5ad5
parent2b99c583498331d6ecad67266c9e744480cc1d24
parent05c8721791a3526a93e2f0f949294e8256d8605c
Merge remote-tracking branch 'suprem/sdk_merge' into 'origin/sdk'

Conflicts:
org.tizen.dynamicanalyzer.workbench.product/resources/config/flatfeature
org.tizen.dynamicanalyzer/.classpath
org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF
org.tizen.dynamicanalyzer/build.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/FlatFeature.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/PrimitiveFeature.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/dlog/DlogTable.java
package/build.linux
package/pkginfo.manifest

Change-Id: I6a5f735610aff506cced641eb599febb5999977c
org.tizen.dynamicanalyzer.workbench/about.mappings
org.tizen.dynamicanalyzer/build.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java
package/build.linux