OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0c312bf
e0cb0fd
)
am e0cb0fd3: resolved conflicts for merge of ba3ed0c7 to gingerbread-plus-aosp
author
Jean-Baptiste Queru
<jbq@google.com>
Wed, 8 Sep 2010 22:51:27 +0000
(15:51 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 8 Sep 2010 22:51:27 +0000
(15:51 -0700)
Merge commit '
e0cb0fd3f5c9626d90ea6907e63530d8e05067f9
'
* commit '
e0cb0fd3f5c9626d90ea6907e63530d8e05067f9
':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Trivial merge