Merge branch 'devel/master' into tizen 98/127798/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 01:37:51 +0000 (10:37 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 01:37:59 +0000 (10:37 +0900)
Change-Id: I8edb9525b2a2cf1ab7ba31684667eb088e6b6919


Trivial merge