OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c090623
67c7026
)
Merge "resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp" into honeycom...
author
Ed Heyl
<edheyl@google.com>
Fri, 4 Mar 2011 23:07:23 +0000
(15:07 -0800)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 4 Mar 2011 23:07:23 +0000
(15:07 -0800)
Trivial merge