Merge branch 'tizen_2.4' into tizen accepted/tizen/mobile/20150917.084437 accepted/tizen/tv/20150917.084511 accepted/tizen/wearable/20150917.084539 submit/tizen/20150917.062942
authorJaeun Choi <jaeun12.choi@samsung.com>
Thu, 27 Aug 2015 06:39:54 +0000 (15:39 +0900)
committerJaeun Choi <jaeun12.choi@samsung.com>
Thu, 27 Aug 2015 06:42:22 +0000 (15:42 +0900)
commit7aa030b1232f876272041bc61cbcdabffa049ece
treea77acb9403e7f85b3fb67479e959a01f194cb0f1
parent689813d6d7089f9b1de674da02487776ccbd43dc
parent2df542ecd037074d5ab327f587817fed883b135f
Merge branch 'tizen_2.4' into tizen

Change-Id: Ic29ca657108327eb5d47b33936e10e7265135204
sdk_fonts_fc/99-slp.conf