From: Kim Gibyoung Date: Thu, 16 May 2013 09:16:35 +0000 (+0900) Subject: Merge branch 'master' into tizen_2.1 X-Git-Tag: accepted/tizen_2.1/20130520.093235^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a5be4f08dbd523b6deb405be75cda353657ed94;p=apps%2Fhome%2Fug-wifi-direct.git Merge branch 'master' into tizen_2.1 Change-Id: I5c22adffd488c6a31aae960de9833c3cc7e02acc --- 6a5be4f08dbd523b6deb405be75cda353657ed94