Merge branch 'tizen' of ssh://review.tizen.org:29418/platform/core/api/thumbnail... 08/41408/1 accepted/tizen/mobile/20150617.012219 accepted/tizen/tv/20150617.012253 accepted/tizen/wearable/20150617.012305 submit/tizen/20150616.014859
authorMinje Ahn <minje.ahn@samsung.com>
Mon, 15 Jun 2015 06:55:31 +0000 (15:55 +0900)
committerMinje Ahn <minje.ahn@samsung.com>
Mon, 15 Jun 2015 06:55:31 +0000 (15:55 +0900)
commita17fe1efa7b5668c94757f28bbfd4a9c354497e2
tree795156c9d6c6a4164920350731e03a4bf770bf1f
parent64bcd480c6070a5bebbab49bbed513c441e47427
parent9591d9dbd54023a3125a6238d8c327357e833661
Merge branch 'tizen' of ssh://review.tizen.org:29418/platform/core/api/thumbnail-util into tizen

Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Conflicts:
src/thumbnail_util.c

Change-Id: Ib3704163da64984fe068d87819b1980801a30dec
include/thumbnail_util_private.h
packaging/capi-media-thumbnail-util.spec
src/thumbnail_util.c