Merge branch 'tizen' into tizen_3.0 18/100418/1 accepted/tizen/3.0/common/20161130.064903 accepted/tizen/3.0/ivi/20161130.011813 accepted/tizen/3.0/mobile/20161130.011546 accepted/tizen/3.0/tv/20161130.011648 submit/tizen_3.0/20161129.051721
authorSeokHoon Lee <andy.shlee@samsung.com>
Mon, 28 Nov 2016 05:58:06 +0000 (14:58 +0900)
committerSeokHoon Lee <andy.shlee@samsung.com>
Mon, 28 Nov 2016 05:58:45 +0000 (14:58 +0900)
commit573f6d473aa29ded40c85a5de4ec84e4dca592eb
tree653953c074862ba855cb46de80680e34eff82f66
parentd21eb4e69a19bdd3053eeeaafebdbc46d1ef9488
parentd2eb8f4b2ff557c21f83d4559b0d42054e9bccb8
Merge branch 'tizen' into tizen_3.0

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

Change-Id: I013ce7c9334e0af64dc7fa6d9c6083b951d2d035