Merge branch 'tizen' into tizen_3.0 51/99151/1
authorsungwook79.park <sungwook79.park@samsung.com>
Tue, 22 Nov 2016 05:20:56 +0000 (14:20 +0900)
committersungwook79.park <sungwook79.park@samsung.com>
Tue, 22 Nov 2016 05:20:56 +0000 (14:20 +0900)
Change-Id: I879007c55b124ed12fc7f91ffb834917d89fda3c


Trivial merge