Merge branch 'tizen' of ssh://tzo/profile/ivi/Modello_Multimediaplayer into tizen 45/28045/1 submit/tizen_ivi/20140924.235357
authorBrian Jones <brian.j.jones@intel.com>
Wed, 24 Sep 2014 23:53:35 +0000 (16:53 -0700)
committerBrian Jones <brian.j.jones@intel.com>
Wed, 24 Sep 2014 23:53:35 +0000 (16:53 -0700)
commit23c51743e021a26325d19f39ba6915b535907bcb
treeaa29d01a39e7db118c3f9e59ada8e7779ad784f7
parentc7fbc97277079ebcb67690e3438948c9cafe5f12
parent75e18c4aaa730a5e5de933c978edabfc9591497b
Merge branch 'tizen' of ssh://tzo/profile/ivi/Modello_Multimediaplayer into tizen

Conflicts:
packaging/modello-multimediaplayer.spec

Change-Id: Iec5c1d60433a5790df4c9c0c6f8b831c71dab606