Merge "[Content] - cancelScanDirectory implemented" into tizen_2.4
authorHyunJin Park <hj.na.park@samsung.com>
Fri, 24 Jul 2015 08:19:49 +0000 (17:19 +0900)
committerGerrit Code Review <gerrit@tizensrc>
Fri, 24 Jul 2015 08:19:49 +0000 (17:19 +0900)

Trivial merge