Merge branch 'tizen_3.0' into tizen 92/114592/1 accepted/tizen/common/20170214.173850 accepted/tizen/ivi/20170214.230148 accepted/tizen/mobile/20170214.230036 accepted/tizen/tv/20170214.230058 submit/tizen/20170214.113450
authorSeokHoon Lee <andy.shlee@samsung.com>
Tue, 14 Feb 2017 06:22:35 +0000 (15:22 +0900)
committerSeokHoon Lee <andy.shlee@samsung.com>
Tue, 14 Feb 2017 06:22:55 +0000 (15:22 +0900)
commiteb61329a45f408786f909314c4b7e7bc775ebe5e
treeea45c4288f01d217e39484caa75df59bace7ffec
parent3e98e79c9d1981b5cb153ef10d75b5525899ff91
parent632db8d5d822180d8520ac171eefedd40b3442ec
Merge branch 'tizen_3.0' into tizen

Conflicts:
packaging/libmm-wfd.spec
src/mm_wfd_sink_priv.c

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I2bc29adcc77634bc57a07dab96e9c2c37b603679
src/mm_wfd_sink_priv.c