Merge branch 'tizen_base' into tizen 83/104683/1
authorDongHun Kwak <dh0128.kwak@samsung.com>
Wed, 14 Dec 2016 05:55:58 +0000 (14:55 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Wed, 14 Dec 2016 05:56:08 +0000 (14:56 +0900)
Change-Id: I2c74270b04a1bf3715e4c34dce17336368209eb5
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

Trivial merge