OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3a0b37a
a2c6d5b
)
am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd282...
author
Nick Kralevich
<nnk@google.com>
Thu, 10 Jun 2010 18:54:53 +0000
(11:54 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 10 Jun 2010 18:54:53 +0000
(11:54 -0700)
Merge commit '
a2c6d5bf308181c019ade0aac6d25fe33dc3d76c
' into kraken
* commit '
a2c6d5bf308181c019ade0aac6d25fe33dc3d76c
':
do not merge: cherry-picked
929b4855b8208d36272769e8eeaa6cd2823b94c0
from master branch
Trivial merge