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:
0d780ae
3fc1f85
)
Merge "resolved conflicts for merge of 7e2181c0 to master"
author
satok
<satok@google.com>
Fri, 3 Jun 2011 01:28:58 +0000
(18:28 -0700)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 3 Jun 2011 01:28:58 +0000
(18:28 -0700)
Trivial merge