Merge branch 'tizen' into tizen_3.0_base 65/95365/1 submit/tizen_3.0_base/20161103.044410 submit/tizen_3.0_base/20161103.045206
authorchleun.moon <chleun.moon@samsung.com>
Thu, 3 Nov 2016 04:43:19 +0000 (13:43 +0900)
committerchleun.moon <chleun.moon@samsung.com>
Thu, 3 Nov 2016 04:43:34 +0000 (13:43 +0900)
Change-Id: Ic1ba0de5d4ffef7e3debed8e309bab8839c3f283
Signed-off-by: cheoleun <chleun.moon@samsung.com>

Trivial merge