projects / platform / core / connectivity / wifi-direct-manager.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9de7fb2 2775945)
Merge branch 'tizen' into tizen_3.0 38/102338/1 accepted/tizen/3.0/common/20161206.125656 accepted/tizen/3.0/ivi/20161205.235816 accepted/tizen/3.0/mobile/20161205.235738 accepted/tizen/3.0/tv/20161205.235747 accepted/tizen/3.0/wearable/20161205.235754 submit/tizen_3.0/20161205.095826
authorYu Jiung <jiung.yu@samsung.com>
Mon, 5 Dec 2016 10:47:46 +0000 (19:47 +0900)
committerYu Jiung <jiung.yu@samsung.com>
Mon, 5 Dec 2016 10:48:03 +0000 (19:48 +0900)
commite1a930c5eedc49a2eaad4961191455fdd02e1eb2
tree71b79b8c504fcffcc89861411b55218b390667d3tree | snapshot
parent9de7fb28b19bb35389e32919a4daef233d7e79d9commit | diff
parent2775945c83f4376c8a9ce95050baa5d00e223371commit | diff
Merge branch 'tizen' into tizen_3.0

Conflicts:
packaging/wifi-direct-manager.spec

Change-Id: I2938f0abf0c1c9700932368e3983b3540e97c587
Signed-off-by: Yu jiung <jiung.yu@samsung.com>
Domain: Network & Connectivity / WiFi;