Merge branch 'tizen_3.0' into tizen_4.0 89/171389/2
authorPiotr Kosko <p.kosko@samsung.com>
Fri, 2 Mar 2018 09:09:42 +0000 (10:09 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Fri, 2 Mar 2018 09:09:48 +0000 (10:09 +0100)
commitf4f0a33a8a66006a086ec35d6868d78c8f1c7979
tree9c00c576f6175a74ab6e823f6cadf81e909efaa6
parent2901196b88fd1fa7a040415f1e8461a29ecb8162
parent841a70ff324aa356cb1fd41942de7c2e70715d99
Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
packaging/cordova-api.spec

Change-Id: I6ce9327e17645c3af41d0409aa8e49175a5e104c