From: Kim Gibyoung <lastkgb.kim@samsung.com>
Date: Tue, 30 Apr 2013 02:41:29 +0000 (+0900)
Subject: Merge branch 'master' into tizen_2.1
X-Git-Tag: submit/tizen_2.1/20130514.053222~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6582cf20627f94d3e5423e028dc80ef0d3a1b6a1;p=apps%2Fnative%2Fug-wifi-direct.git

Merge branch 'master' into tizen_2.1

Change-Id: Ia7ad9f72dbea631aa4043ac3b01bbcc91b837e55
---

6582cf20627f94d3e5423e028dc80ef0d3a1b6a1