OSDN Git Service
(root)
/
android-x86
/
development.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d1ca4f3
eefb5c2
)
am eefb5c2d: Merge "Update native_activity sample to use new glue code." into gingerbread
author
Dianne Hackborn
<hackbod@google.com>
Thu, 8 Jul 2010 19:28:33 +0000
(12:28 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 8 Jul 2010 19:28:33 +0000
(12:28 -0700)
Merge commit '
eefb5c2dca087c2b0a0ef90e15db00fb5523d8af
' into gingerbread-plus-aosp
* commit '
eefb5c2dca087c2b0a0ef90e15db00fb5523d8af
':
Update native_activity sample to use new glue code.
Trivial merge