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:
d809e1d
6d5ca9f
)
am 6d5ca9f4: am 52cefc36: resolved conflicts for merge of 6ca56b6a to klp-modular...
author
Ying Wang
<wangying@google.com>
Fri, 21 Feb 2014 18:35:24 +0000
(10:35 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 21 Feb 2014 18:35:24 +0000
(10:35 -0800)
* commit '
6d5ca9f46bbb3e06a69e1b6465d4fa969fb2ed77
':
Make the module existence check nonfatal
Trivial merge