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

author heeyoung <heeyoung1008.hwang@samsung.com>

Wed, 12 Nov 2014 04:41:51 +0000 (13:41 +0900)

committer heeyoung <heeyoung1008.hwang@samsung.com>

Wed, 12 Nov 2014 04:42:16 +0000 (13:42 +0900)
author heeyoung <heeyoung1008.hwang@samsung.com>
Wed, 12 Nov 2014 04:41:51 +0000 (13:41 +0900)
committer heeyoung <heeyoung1008.hwang@samsung.com>
Wed, 12 Nov 2014 04:42:16 +0000 (13:42 +0900)
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java
Simple merge
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/InputRow.java
Simple merge
diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java
Simple merge
author	heeyoung <heeyoung1008.hwang@samsung.com>
	Wed, 12 Nov 2014 04:41:51 +0000 (13:41 +0900)
committer	heeyoung <heeyoung1008.hwang@samsung.com>
	Wed, 12 Nov 2014 04:42:16 +0000 (13:42 +0900)
		1	2
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java	patch \|	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/InputRow.java	patch \|	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java	patch \|	diff1 \|	diff2 \|	blob \| history