Merge branch 'tizen' of ssh://review.tizen.org:29418/platform/core/multimedia/libmedi... 44/84144/1
authorMinje Ahn <minje.ahn@samsung.com>
Wed, 17 Aug 2016 04:29:42 +0000 (13:29 +0900)
committerMinje Ahn <minje.ahn@samsung.com>
Wed, 17 Aug 2016 04:29:42 +0000 (13:29 +0900)
commit6f5e9fb1db65f9d21e91cf4dcec303e5bbbf7282
treef1fc52dfd36a4131edd7ed807060feb81466120a
parenta2039232d3e5c5992428544cf9f7b96e23297459
parent5e020b2c136c13e1cf26f81bb7d290ad6a09f587
Merge branch 'tizen' of ssh://review.tizen.org:29418/platform/core/multimedia/libmedia-service into tizen

Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Conflicts:
src/common/media-svc-util.c

Change-Id: Id5926f0a5bfaf1e97f2a113060f8643886260fa5
src/common/media-svc-util.c