Merge "Merge branch 'devel/master(1.2.18)' into tizen" into tizen
authorsuhyung Eom <suhyung.eom@samsung.com>
Tue, 13 Dec 2016 11:26:30 +0000 (03:26 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 13 Dec 2016 11:26:30 +0000 (03:26 -0800)

Trivial merge