From: Hyejin Kim <hyejin0906.kim@tizendev.org>
Date: Thu, 6 Sep 2012 06:55:34 +0000 (+0900)
Subject: Merge "show NFC on emulator" into 2.0_beta
X-Git-Tag: 2.0_alpha~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=74e77e356b5dc0bd258cd6dfd64b40a3a06cf477;p=apps%2Fcore%2Fpreloaded%2Fsettings.git

Merge "show NFC on emulator" into 2.0_beta
---

74e77e356b5dc0bd258cd6dfd64b40a3a06cf477