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:
201a77e
cbbfffc
)
resolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp
author
Eric Fischer
<enf@google.com>
Thu, 2 Feb 2012 22:07:34 +0000
(14:07 -0800)
committer
Eric Fischer
<enf@google.com>
Thu, 2 Feb 2012 22:07:34 +0000
(14:07 -0800)
Change-Id: I2b80331b5c56eb46b88513bc841f54001405a5fc
Trivial merge