Merge tizen_4.0 into tizen 26/199226/2 submit/tizen/20190311.143210 submit/tizen/20190312.095229 submit/tizen/20190315.105214 submit/tizen_5.0/20190311.143405 submit/tizen_5.0/20190312.095251 submit/tizen_5.0/20190314.052825 submit/tizen_5.0/20190315.105239
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Thu, 7 Feb 2019 10:16:12 +0000 (11:16 +0100)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Thu, 7 Feb 2019 10:35:32 +0000 (11:35 +0100)
commit7e58d616e29b714d73439c667e2a7ff720a5631f
treee77672cc6334ce8a0a1522ccd8aef1975a1a6db3
parent06e1789fcc65ecd6e7d654b274d40a2e13d6f787
parent9db2a689d1b3ff707dedaa5f15a4a44ceb61ca90
Merge tizen_4.0 into tizen

Change-Id: Ibc4f1105aad26c5df9a640775e81bfc761403c5a
fota/fota.cpp
server/engine/encryption/dmcrypt-engine.cpp
server/external-encryption.cpp
server/internal-encryption.cpp
server/upgrade-support.cpp