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:
5950667
775997c
)
am a3e4293c: am 163bd407: Merge "Added getType() to NDEF technology class (API part...
author
Nick Pelly
<npelly@google.com>
Tue, 4 Jan 2011 05:03:06 +0000
(21:03 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 4 Jan 2011 05:03:06 +0000
(21:03 -0800)
* commit '
a3e4293cdc7d09ac93c95d233e4052ac4435773e
':
Added getType() to NDEF technology class (API part).
Trivial merge