Merge branch 'public_tizen' into tizen_sdk
authorseokgil.kang <seokgil.kang@samsung.com>
Mon, 18 May 2015 06:40:25 +0000 (15:40 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Mon, 18 May 2015 06:40:37 +0000 (15:40 +0900)
commit351e160ae9647e6b4857f3efff27d2294ee891bc
tree15fcc2698ec66c4a2a604aa57afff0c0baa4bfee
parent581f063bddec31db24bec7d74f494dc4231c9b12
parent92333c8bd772aadb6f72dfd94ed3410690b98d45
Merge branch 'public_tizen' into tizen_sdk

Conflicts:
org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java

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