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)
Conflicts:
preload/preload_storage.c

Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
Change-Id: I28203dee54e9222aa10bab2d4256fcd784d55169

1  2 
packaging/swap-modules.spec

Simple merge