Merge branch 'devel/master' into tizen 79/127779/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 01:18:35 +0000 (10:18 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 01:18:45 +0000 (10:18 +0900)
Change-Id: Idf8019b23a2d2f00c2f954dbf8f24d59e8a44371


Trivial merge