Merge branch 'tizen' into tizen_3.0 25/96025/1
authorMyungki Lee <mk5004.lee@samsung.com>
Mon, 7 Nov 2016 10:45:05 +0000 (19:45 +0900)
committerMyungki Lee <mk5004.lee@samsung.com>
Mon, 7 Nov 2016 10:45:37 +0000 (19:45 +0900)
Change-Id: I3a643ee1131d1746fb0b4db8d027659e2ba3d1d8


Trivial merge