Merge branch 'tizen_3.0' into tizen 15/104215/1 accepted/tizen/common/20161214.160029 accepted/tizen/wearable/20161213.003635 submit/tizen/20161212.223531
authorJihoon Kim <jihoon48.kim@samsung.com>
Mon, 12 Dec 2016 22:32:57 +0000 (07:32 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 12 Dec 2016 22:33:02 +0000 (07:33 +0900)
Change-Id: Ib6ead764b68634f3fbd3bab101e13ff62396fadf


Trivial merge