Merge branch 'devel/master' into tizen 93/125393/1
authorJinho, Lee <jeano.lee@samsung.com>
Mon, 17 Apr 2017 02:06:46 +0000 (11:06 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Mon, 17 Apr 2017 02:07:27 +0000 (11:07 +0900)
commita87b66f17ef4490a627b48dfe37bceb2411b8acc
tree503e760fb26b12510f95084873e8118c9b0b7935
parent8816a0432c37b4db17f64562d69150a564958627
parent1fd51ce4009daf5b63b2127fc6f5c6d8c34c932e
Merge branch 'devel/master' into tizen

Change-Id: I6355e3366a8ed022467d37d94821e23e2918f848