OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9ba362b
dc4a713
)
am ebc910da: Merge change Iaad9c8d1 into eclair-mr2
author
Andy McFadden
<fadden@android.com>
Fri, 4 Dec 2009 23:42:43 +0000
(15:42 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 4 Dec 2009 23:42:43 +0000
(15:42 -0800)
Merge commit '
ebc910da96f4dbb036e16971c1041f8287342aa4
' into eclair-mr2-plus-aosp
* commit '
ebc910da96f4dbb036e16971c1041f8287342aa4
':
Restore 7.xml.
Trivial merge