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