Merge branch 'tizen' into tizen_3.0 submit/tizen/20161111.080541
authorHwankyu Jhun <h.jhun@samsung.com>
Fri, 11 Nov 2016 05:21:57 +0000 (14:21 +0900)
committerHwankyu Jhun <h.jhun@samsung.com>
Fri, 11 Nov 2016 05:21:57 +0000 (14:21 +0900)

Trivial merge