Merge remote-tracking branch 'origin/tizen' into mw

Change-Id: Ie74e78be7df964e33a715c3279b5f2fa28a3164d
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java
index 110ce9e,e8e5ee7..e56f7dd
--- 1/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java
--- 2/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java
@@@ -86,10 -86,10 +86,10 @@@ public class ConfigurationDialogDataMan
                        featuresList.add(ConfigureLabels.FEATURE_SCREENSHOT);
                        featuresList.add(ConfigureLabels.FEATURE_USER_EVENT);
                        featuresList.add(ConfigureLabels.FEATURE_RECORDING);
 -                      featuresList.add(ConfigureLabels.FEATURE_CONTEXT_SWITCH);
 +//                    featuresList.add(ConfigureLabels.FEATURE_CONTEXT_SWITCH);
  
                        featuresSyscallList = new ArrayList<String>();
-                       // featuresSyscallList.add(ConfigureLabels.FEATURE_SYSCALL_FILE);
+                        featuresSyscallList.add(ConfigureLabels.FEATURE_SYSCALL_FILE);
                        // featuresSyscallList.add(ConfigureLabels.FEATURE_SYSCALL_IPC);
                        // featuresSyscallList.add(ConfigureLabels.FEATURE_SYSCALL_PROCESS);
                        // featuresSyscallList.add(ConfigureLabels.FEATURE_SYSCALL_SIGNAL);