Merge branch 'tizen' into tizen_3.0 26/96126/1
authorJeongmo Yang <jm80.yang@samsung.com>
Tue, 8 Nov 2016 02:31:05 +0000 (11:31 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Tue, 8 Nov 2016 02:31:09 +0000 (11:31 +0900)
Change-Id: Iccc3dbb3dffbf81cf6c49a7724dd2ee0b5e6f123


Trivial merge