summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* Fix bad merge from gingerbread:Jeff Hamilton2011-05-242-0/+0
* am 93d8a69c: Add com.android.nfc.permission.NFCEE_ADMIN.Jeff Hamilton2011-03-301-0/+5
|\
| * Add com.android.nfc.permission.NFCEE_ADMIN.Jeff Hamilton2011-03-251-0/+5
| * DO NOT MERGE - Updating Nfc assets -- should rename actual assets at some poi...Justin Ho2010-10-284-0/+0
* | Removed unused assets.Gilles Debunne2010-11-168-0/+0
|/
* Show an icon in the status bar when the NfcAdapter is in card emulation mode.Jeff Hamilton2010-10-252-0/+0
* Enable NFC service as an application service.Nick Pelly2010-10-151-0/+1
* NFC application.Nick Pelly2010-10-149-0/+4