Merge remote-tracking branch 'origin/tizen' into da-setting

Change-Id: Icebb7c79daadecf6bb3ace92ad5601bead555a6e
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>

diff --cc org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ImageResources.java
Simple merge

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java
Simple merge

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties
Simple merge

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java
Simple merge

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java
Simple merge

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java
index 8d9940b,237ff88..62cacf8
--- 1/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java
--- 2/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java
@@@ -92,10 -92,11 +92,11 @@@ public class NewLeakDetector 
        // Feature On : false, Feature Off : true 
        private boolean isDropLog(LogData logData) {
                TargetData target = SettingDataManager.getInstance().getConnectedTarget();
-               int id = logData.getId();
-               switch (id) {
+               ProbeCommonData pData = (ProbeCommonData) logData;
+               if (!pData.isInternal())        return false;
+               switch (pData.getId()) {
                case DataChannelConstants.MSG_PROBE_FILE:
 -                      if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)) {
 +                      if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_FILE)) {
                                return false;
                        }
                        break;

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java
Simple merge