Merge branch 'tizen_3.0_base' into tizen_base 66/95366/1 submit/tizen_base/20161103.045154
authorchleun.moon <chleun.moon@samsung.com>
Thu, 3 Nov 2016 04:45:57 +0000 (13:45 +0900)
committerchleun.moon <chleun.moon@samsung.com>
Thu, 3 Nov 2016 04:46:11 +0000 (13:46 +0900)
Change-Id: If19e1e8ff43361d06f956ec72892838ba56cb22d
Signed-off-by: cheoleun <chleun.moon@samsung.com>

Trivial merge