OSDN Git Service
(root)
/
android-x86
/
manifest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
87ea759
f46b8df
)
Merge from master
author
Conley Owens
<cco3@android.com>
Fri, 26 Oct 2012 17:02:08 +0000
(10:02 -0700)
committer
Conley Owens
<cco3@android.com>
Fri, 26 Oct 2012 17:02:22 +0000
(10:02 -0700)
Change-Id: I4bf730aa31e8695ba381c306641d4f98f7506581
1
2
default.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
default.xml
Simple merge