Merge branch 'tizen_base' into tizen 20/75520/1
authorDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 20 Jun 2016 08:16:08 +0000 (17:16 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Mon, 20 Jun 2016 08:17:28 +0000 (17:17 +0900)
Change-Id: Ief4dc0516d31edb38813c9fdb1fc0d15ea458f55
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

Trivial merge