Merge branch 'tizen_base' into tizen 31/163531/1 accepted/tizen_unified tizen accepted/tizen/unified/20171212.064724 submit/tizen/20171212.022905
authorMyoungJune Park <mj2004.park@samsung.com>
Tue, 12 Dec 2017 02:21:16 +0000 (11:21 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Tue, 12 Dec 2017 02:21:34 +0000 (11:21 +0900)
Change-Id: I7dcb6c99a52e5e7d853f567221834cc42330bc57
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>

Trivial merge