Merge branch 'tizen_3.0' into tizen_4.0 36/152636/1
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 26 Sep 2017 15:57:24 +0000 (18:57 +0300)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 26 Sep 2017 15:57:31 +0000 (18:57 +0300)
commit0892cffe41a4065a8a0b150c128d316221b257d0
tree7c465fe8fcd886ab65bc2cc6ed77cae35e71b36f
parent4b052aa00c59a399183e4fdb7f87cfe63cca78c6
parente0199c925b570db5ca28c1b463aa8b506e0d9bb5
Merge branch 'tizen_3.0' into tizen_4.0

Change-Id: Ic9c6a6fd8aa44c1900020786b8642f082a1f44ea
daemon/Makefile
swap-manager.manifest