Merge branch 'tizen' into tizen_3.0 66/95666/1 submit/tizen_3.0/20161104.071802
authorjin0.kim <jin0.kim@samsung.com>
Fri, 4 Nov 2016 07:05:27 +0000 (15:35 +0830)
committerjin0.kim <jin0.kim@samsung.com>
Fri, 4 Nov 2016 07:07:18 +0000 (15:37 +0830)
Change-Id: I3c400f71424f6f50862c753538c26626fbf259a4


Trivial merge