Merge branch 'tizen' into mw 36/26836/1
authorseokgil.kang <seokgil.kang@samsung.com>
Fri, 29 Aug 2014 08:09:13 +0000 (17:09 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Fri, 29 Aug 2014 08:09:13 +0000 (17:09 +0900)
Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java

Change-Id: I76412ccd0983e8ba31cbb3eea93cb19db3d4b616
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>

Trivial merge