Merge branch 'tizen_3.0_base' into tizen_base 19/95419/1 accepted/tizen/base/20161104.200131 submit/tizen_base/20161103.074054 tizen_4.0.m1_release
authorchleun.moon <chleun.moon@samsung.com>
Thu, 3 Nov 2016 07:36:28 +0000 (16:36 +0900)
committerchleun.moon <chleun.moon@samsung.com>
Thu, 3 Nov 2016 07:36:44 +0000 (16:36 +0900)
Change-Id: I5ab9d75268fe587280668f752f93908decb84c64
Signed-off-by: cheoleun <chleun.moon@samsung.com>

Trivial merge