Merge branch 'devel/master(1.2.18)' into tizen 83/104483/1
authorsuhyung Eom <suhyung.eom@samsung.com>
Tue, 13 Dec 2016 10:37:23 +0000 (19:37 +0900)
committersuhyung Eom <suhyung.eom@samsung.com>
Tue, 13 Dec 2016 10:37:56 +0000 (19:37 +0900)
Change-Id: I55c7a9122ed65b1beb882da42ffb7b2e520b08c0


Trivial merge