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:
0e5e16a
54cb63e
)
resolved conflicts for merge of 54cb63e2 to master
author
Dianne Hackborn
<hackbod@google.com>
Thu, 2 Jun 2011 23:44:52 +0000
(16:44 -0700)
committer
Dianne Hackborn
<hackbod@google.com>
Thu, 2 Jun 2011 23:44:52 +0000
(16:44 -0700)
Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
Trivial merge