Merge branch 'tizen' into tizen_3.0 submit/tizen/20161111.000844 submit/tizen_3.0/20161111.001102
authorHwankyu Jhun <h.jhun@samsung.com>
Fri, 11 Nov 2016 00:06:17 +0000 (09:06 +0900)
committerHwankyu Jhun <h.jhun@samsung.com>
Fri, 11 Nov 2016 00:06:17 +0000 (09:06 +0900)

Trivial merge