Merge branch 'tizen_3.0' into tizen 19/139519/1 accepted/tizen/unified/20170719.132325 submit/tizen/20170719.080849 submit/tizen/20170719.081707
authorLukasz Bardeli <l.bardeli@samsung.com>
Wed, 19 Jul 2017 07:57:08 +0000 (09:57 +0200)
committerLukasz Bardeli <l.bardeli@samsung.com>
Wed, 19 Jul 2017 07:58:07 +0000 (09:58 +0200)
commit06a7b28e23580f7318aa5cdc67fa0e86b5d498ae
treecf01bb9d143b378cd718096de8ac6d0cd998d9fa
parent14e60fd52a8e8c5e8b6b4aba5d4bd5c2a4859a96
parent557cd7f81bb475633bdaa8147bdce701880d1674
Merge branch 'tizen_3.0' into tizen

Change-Id: I5d4245b4f62c0802e9d73397df97d097683d05b9
packaging/webapi-plugins.spec
src/systeminfo/systeminfo_api.js