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:
859c7a3
7b6ecc4
)
am 3a223404: Merge "New APIs for NDEF Push Protocol." into gingerbread
author
Jeff Hamilton
<jham@android.com>
Tue, 18 Jan 2011 19:26:22 +0000
(11:26 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 18 Jan 2011 19:26:22 +0000
(11:26 -0800)
* commit '
3a223404e7589831a901cb16c5ce97685bc1f3f8
':
New APIs for NDEF Push Protocol.
Trivial merge