Merge remote-tracking branch 'media-content/tizen'
authorWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 01:02:34 +0000 (10:02 +0900)
committerWonYoung Choi <wy80.choi@samsung.com>
Thu, 10 Aug 2017 01:02:34 +0000 (10:02 +0900)
Change-Id: I97b37cfee6a2477e74c89c7719ee5ba79d801169


Trivial merge