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:
ae0c323
bd74632
)
am 18dedf2c: am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to...
author
Trevor Johns
<trevorjohns@google.com>
Mon, 11 Jan 2010 22:08:15 +0000
(14:08 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 11 Jan 2010 22:08:15 +0000
(14:08 -0800)
Merge commit '
18dedf2cdfd2c78d93061f20c4269f00449a8e6a
'
* commit '
18dedf2cdfd2c78d93061f20c4269f00449a8e6a
':
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Trivial merge