From: Kim Gibyoung Date: Fri, 10 May 2013 11:40:18 +0000 (+0900) Subject: Merge branch 'master' into tizen_2.1 X-Git-Tag: submit/tizen_2.1/20130514.053222^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48d60e5d1b671008cf183ade544baa7a1c66c602;p=apps%2Fnative%2Fug-wifi-direct.git Merge branch 'master' into tizen_2.1 Change-Id: I56374d9fa93e4b24601b6224aef8f93afac9de27 --- 48d60e5d1b671008cf183ade544baa7a1c66c602