Merge branch 'develop' into features/newscreen
authorJinhyung Jo <jinhyung.jo@samsung.com>
Thu, 7 Jul 2016 11:18:29 +0000 (20:18 +0900)
committerJinhyung Jo <jinhyung.jo@samsung.com>
Thu, 7 Jul 2016 11:18:57 +0000 (20:18 +0900)
Change-Id: Ie67dad5a116cad223ef14a5bab2553b4a7c8dd34
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

Trivial merge