Merge branch 'tizen_3.0' into tizen_4.0 06/176306/2 submit/tizen_4.0/20180418.112525
authorPiotr Kosko <p.kosko@samsung.com>
Wed, 18 Apr 2018 08:49:16 +0000 (10:49 +0200)
committerPiotr Kosko <p.kosko@samsung.com>
Wed, 18 Apr 2018 08:49:16 +0000 (10:49 +0200)
commit088c3d856ac8a0ea8fb88523e33d812fd8c8d7ab
tree2c2113f4f08d60356a3dc12f8e1cf54bf878ebce
parent5c3f9aa1dc7865cc4f253ec1f7f252f818885552
parent87e3fe5c183776964cd7ff227748f58a332355cb
Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
src/application/application_manager.cc
src/power/power.gyp

Change-Id: Ib9baaf8221cc99b01cfe8343b0e36a197c669941
packaging/webapi-plugins.spec
src/iotcon/iotcon_utils.cc