OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
33d2935
5f40f7c
)
am fd34aa8e: am 5644d0e1: Support for NDEF on iCODE.
author
Jeff Hamilton
<jham@android.com>
Fri, 25 Feb 2011 04:43:15 +0000
(20:43 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 25 Feb 2011 04:43:15 +0000
(20:43 -0800)
* commit '
fd34aa8e1386547bcfbaf043f26c054946b92c2b
':
Support for NDEF on iCODE.
Trivial merge