Merge remote-tracking branch 'origin/tizen' into da-setting 88/27088/1
authorheeyoung <heeyoung1008.hwang@samsung.com>
Thu, 4 Sep 2014 09:12:22 +0000 (18:12 +0900)
committerheeyoung <heeyoung1008.hwang@samsung.com>
Thu, 4 Sep 2014 09:12:56 +0000 (18:12 +0900)
commitf63258ebcadf2421ed55609345bc33acb94d265f
treeb79c15664ca2c231988bb2e261cdd2f9ec62e8a3
parent982ad5c035f72e9febd3177664c1f5f0bdcebbe5
parent93473cddb0e49c5bbcbb771c2077fc0859a2c52c
Merge remote-tracking branch 'origin/tizen' into da-setting

Change-Id: Ia67d5981dccea6ac22ffc97799529c981cf7d4aa
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties