Merge remote-tracking branch 'spin/tizen_2.4' into tizen accepted/tizen/ivi/20160218.023428 accepted/tizen/mobile/20150917.084321 accepted/tizen/tv/20150917.084342 accepted/tizen/wearable/20150917.084401 submit/tizen/20150917.062933 submit/tizen_common/20151229.142028 submit/tizen_common/20151229.144031 submit/tizen_common/20151229.154718 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000002 tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release
authorJaeun Choi <jaeun12.choi@samsung.com>
Mon, 7 Sep 2015 07:54:20 +0000 (16:54 +0900)
committerJaeun Choi <jaeun12.choi@samsung.com>
Mon, 7 Sep 2015 07:54:20 +0000 (16:54 +0900)
commit8428d33b5e94571d8af4f38a73589c015575f699
tree7845210487251f6bdb4aa891dd2998247f80e26b
parent9aa83b608760b037b579cdc490f45fc84e3c0eb1
parent45a2eba4f736c0eb1bcb37419ca088a2df614485
Merge remote-tracking branch 'spin/tizen_2.4' into tizen

Conflicts:
LICENSE
packaging/default-fonts-sdk.spec

Change-Id: Ia1ed0334b17afe4e595ce313270cfaae91f3476d
packaging/default-fonts-sdk.spec