Merge branch 'mw' into tizen 16/25616/1
authorseokgil.kang <seokgil.kang@samsung.com>
Thu, 7 Aug 2014 09:57:01 +0000 (18:57 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Thu, 7 Aug 2014 09:57:01 +0000 (18:57 +0900)
commit6336a9444481ca50e7529b48caa6370a3e1c7474
treeaa67a1da518df83127550ac1f4b5f618bbcb0504
parent2514863177742d6e235f1da134ecc2f447d1dfb6
parent7caeac427d4aec498bd07be758cb65b51a3b9b61
Merge branch 'mw' into tizen

Conflicts:
package/changelog
package/pkginfo.manifest

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