Merge branch 'devel/master (1.2.36+)' into tizen 31/126831/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 25 Apr 2017 06:29:58 +0000 (15:29 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 25 Apr 2017 06:30:25 +0000 (15:30 +0900)
commit58c6def73d5d1180527e2d0f6fe839cf112d11d4
tree99faf152f1f47ee5ffb2584bf1361cb316f937a1
parent5a3ce2e5cd6521f7088115b997d61a71823276e6
parentacf5beb7c6add7f9aee259715c24e1e75ddbedab
Merge branch 'devel/master (1.2.36+)' into tizen

Change-Id: I02bd0acfb1c23ad694b517af34ece69c200d87a6