Merge branch 'tizen' into opensrc_p3.0 44/145144/1
authorjinh0.choi <jinh0.choi@samsung.com>
Mon, 21 Aug 2017 10:45:33 +0000 (19:45 +0900)
committerjinh0.choi <jinh0.choi@samsung.com>
Mon, 21 Aug 2017 10:45:38 +0000 (19:45 +0900)
Change-Id: I6a7b68833aaae1b9680af1c100513c9353201bb9
Signed-off-by: jinh0.choi <jinh0.choi@samsung.com>

Trivial merge