Merge branch 'tizen_p2.3.1' into tizen_studio_2.0_p2.3.1 16/136216/1
authorSooyoung Ha <yoosah.ha@samsung.com>
Wed, 28 Jun 2017 09:05:35 +0000 (18:05 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Wed, 28 Jun 2017 09:05:58 +0000 (18:05 +0900)
Change-Id: Iaebaa84a057a9115aa56858769244a57aa9a7f10
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

Trivial merge