Merge branch 'develop' into platform_3.0
authorJinhyung Jo <jinhyung.jo@samsung.com>
Thu, 6 Oct 2016 02:30:45 +0000 (11:30 +0900)
committerJinhyung Jo <jinhyung.jo@samsung.com>
Thu, 6 Oct 2016 02:31:47 +0000 (11:31 +0900)
Change-Id: I6220a2fa60588cb34984ed63dcf8b4cd2028eb72
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

Trivial merge