Merge branch 'tizen' into mw 96/21096/1
authorseokgil.kang <seokgil.kang@samsung.com>
Thu, 15 May 2014 05:40:09 +0000 (14:40 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Thu, 15 May 2014 05:43:47 +0000 (14:43 +0900)
commit11c93afa9c062ad06ad846fdc8dbdb4d0e70d5ae
treec643a68b36ab35997bf05d6c79358b76f27d87a7
parent468cd4e24c62986822c7e829d9b8911aab7284d4
parent1bb89a714ebedf92dbabc6a8354d6d41b98b19fd
Merge branch 'tizen' into mw

Conflicts:
package/pkginfo.manifest

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