Merge branch 'devel/master' into tizen 80/133580/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 01:58:22 +0000 (10:58 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 01:58:31 +0000 (10:58 +0900)
Change-Id: Id6c15bc1aa2b37eb582c6c6246079517d7044b25


Trivial merge