Merge branch 'opensrc_p2.3.1' into tizen_studio_1.3_p2.3.1 06/146206/1
authorjinh0.choi <jinh0.choi@samsung.com>
Fri, 25 Aug 2017 08:36:13 +0000 (17:36 +0900)
committerjinh0.choi <jinh0.choi@samsung.com>
Fri, 25 Aug 2017 08:36:39 +0000 (17:36 +0900)
Change-Id: I59e4fb54c60da8a5dd02bd7e87098130bbd09f5c
Signed-off-by: jinh0.choi <jinh0.choi@samsung.com>

Trivial merge