Merge branch 'tizen_2.4' into tizen
authorseokgil.kang <seokgil.kang@samsung.com>
Thu, 20 Aug 2015 12:21:11 +0000 (21:21 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Thu, 20 Aug 2015 12:21:11 +0000 (21:21 +0900)
commit8e3ca345e06417de461395e082dec011603a5b86
treeecaf06a17e6d491c895359245cbbe39ee96f71cc
parent25b30520977d42ae6a3427cd79d1abc64ceb414c
parent581f063bddec31db24bec7d74f494dc4231c9b12
Merge branch 'tizen_2.4' into tizen

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

Change-Id: Ifdb7bb780ba5c017f9005d80e93a3e0f99da01bc
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
package/pkginfo.manifest