OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8c8e9d9
7bcd2c6
)
am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
author
daniel_tomas
<daniel.tomas@nxp.com>
Wed, 16 Feb 2011 17:41:00 +0000
(09:41 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 16 Feb 2011 17:41:00 +0000
(09:41 -0800)
* commit '
7bcd2c62ebfad640e8082c1dc700c9d8c57aba81
':
New API added in NfcAdapter to enable/disable SE card emulation
Trivial merge