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:
cd92dd0
67a50f9
)
resolved conflicts for merge of 67a50f99 to ics-scoop
author
Eric Fischer
<enf@google.com>
Thu, 2 Feb 2012 22:00:17 +0000
(14:00 -0800)
committer
Eric Fischer
<enf@google.com>
Thu, 2 Feb 2012 22:00:17 +0000
(14:00 -0800)
Change-Id: I75009fa3089704e2b5045fda6716f733ae2b06fa
Trivial merge