Merge branch 'devel/masteri (1.2.36+)' into tizen 52/126752/1
authortaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 25 Apr 2017 04:48:04 +0000 (13:48 +0900)
committertaeyoon0.lee <taeyoon0.lee@samsung.com>
Tue, 25 Apr 2017 04:50:11 +0000 (13:50 +0900)
commit30eec5ebfcb0427a583e389f3de83b481a614312
tree23f797f1c3a28a5b2f0655e92eb1a775fc60d1e1
parent25fe1b308dc7952a8c1bcc19ab43f93390df8297
parent0e8f8f6788b64185213a29eeb3e2438e8531d5f7
Merge branch 'devel/masteri (1.2.36+)' into tizen

Change-Id: I1bf7a699452ea0f549f53c3580bc875d8f17775c