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:
94db7c3
636dc20
)
am 636dc20d: resolved conflicts for merge of ad495272 to master
author
Ying Wang
<wangying@google.com>
Thu, 20 Mar 2014 22:28:02 +0000
(15:28 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 20 Mar 2014 22:28:02 +0000
(15:28 -0700)
* commit '
636dc20d1a2ddb44b345be5ad6e04024788ad90b
':
Fix embedded build
Trivial merge