Merge branch 'tizen_3.0' into tizen 24/99124/1
authorGilbok Lee <gilbok.lee@samsung.com>
Tue, 22 Nov 2016 03:50:03 +0000 (12:50 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Tue, 22 Nov 2016 03:50:08 +0000 (12:50 +0900)
Change-Id: I3d05bb41d2b61dc6b75e8b2881b23465d7c88552


Trivial merge