Merge branch 'devel/master' into tizen 14/111214/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 20 Jan 2017 02:35:50 +0000 (11:35 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 20 Jan 2017 02:35:58 +0000 (11:35 +0900)
Change-Id: Ib2fe4bae51181971cab492583f586611bc05060f


Trivial merge