Merge branch 'tizen_2.4_dev' into tizen 02/59202/2
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Wed, 10 Feb 2016 12:21:15 +0000 (15:21 +0300)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Fri, 12 Feb 2016 13:30:27 +0000 (05:30 -0800)
commit3c61f688714c239425d3e0b1f2349909e489a3f3
treea5921da9bbaba23e5cad3d9ab13f0ebb1ca3b36e
parentc75082359a83cbf108579842bb2b2d54f095448d
parent00f860f7feb78394c35d4a0a3913a6e6f562ccd0
Merge branch 'tizen_2.4_dev' into tizen

Conflicts:
preload/preload_storage.c

Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
Change-Id: I28203dee54e9222aa10bab2d4256fcd784d55169
packaging/swap-modules.spec