Merge remote-tracking branch 'origin/tizen' into mw 43/29243/1
authorheeyoung <heeyoung1008.hwang@samsung.com>
Thu, 23 Oct 2014 07:04:56 +0000 (16:04 +0900)
committerheeyoung <heeyoung1008.hwang@samsung.com>
Thu, 23 Oct 2014 07:04:56 +0000 (16:04 +0900)
commit6346e445b32b8fb2259186bf4d81ac50c680e82c
treee34deec804e36e74892b6f2203d82ff216caacb9
parent1caa22962b98b2e38ac35aedb8ae820c8c387afc
parent5bd97c00c2c1a585aa5b2f74ce47fba94a0dfee9
Merge remote-tracking branch 'origin/tizen' into mw

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java

Change-Id: I2041f7249e9c2229e781f9a4369b1dd9bace5d05
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
package/pkginfo.manifest