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


Trivial merge