Merge branch 'tizen' into tizen_3.0 12/94912/1
authorKyuho Jo <kyuho.jo@samsung.com>
Wed, 2 Nov 2016 02:44:26 +0000 (11:44 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Wed, 2 Nov 2016 03:57:54 +0000 (12:57 +0900)
Change-Id: I85c89f1f303d1efee46a4d3d9322bc246c39913f
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

Trivial merge