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:
ff10dad
fd7d4cf
)
am 55fa681a: (-s ours) am bb09485b: Merge commit \'09564fbb\' into manualmerge
author
Irfan Sheriff
<isheriff@google.com>
Fri, 13 May 2011 00:31:25 +0000
(17:31 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 13 May 2011 00:31:25 +0000
(17:31 -0700)
* commit '
55fa681ac774240509def9d75ad7e16ea5515dd1
':
DO NOT MERGE Define Protocol class
Trivial merge