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:
1894fc2
fad4d64
)
am 17523abb: NFC Adapter Extras API update.
author
Nick Pelly
<npelly@google.com>
Mon, 20 Jun 2011 22:54:07 +0000
(15:54 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 20 Jun 2011 22:54:07 +0000
(15:54 -0700)
* commit '
17523abb45b7f77f35af53e895d74be13f2314e0
':
NFC Adapter Extras API update.
Trivial merge