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)
commitdd1b27089951e80641465215c87b1bfd97f648b8
tree973e1a6848ba3a44a1e9d07fda143e618c726167
parentaca496c9e0b376cbd56b88e8527a5288722138c3
parentdef074889d66bfec4a5c4bd82cc3f39f3eb1e397
Merge branch 'develop' into features/newscreen

Change-Id: Ie67dad5a116cad223ef14a5bab2553b4a7c8dd34
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>