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


Trivial merge