Merge branch 'tizen' into opensrc_p2.4 42/145142/1
authorjinh0.choi <jinh0.choi@samsung.com>
Mon, 21 Aug 2017 10:44:38 +0000 (19:44 +0900)
committerjinh0.choi <jinh0.choi@samsung.com>
Mon, 21 Aug 2017 10:44:43 +0000 (19:44 +0900)
Change-Id: Ie6f3422b82071008ad929798773db3115fedd5b8
Signed-off-by: jinh0.choi <jinh0.choi@samsung.com>

Trivial merge