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:
265bbb5
81ba978
)
am 81ba9784: Merge "NFC: Unify ApduServiceInfo for on/off host."
author
Martijn Coenen
<maco@google.com>
Thu, 8 Aug 2013 22:55:05 +0000
(15:55 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 8 Aug 2013 22:55:05 +0000
(15:55 -0700)
* commit '
81ba97841089bd23b82c7c6feadd3112ad22966c
':
NFC: Unify ApduServiceInfo for on/off host.
Trivial merge