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:
f2ab290
7fa4a21
)
am 7fa4a21e: (-s ours) am 780c2372: accommodate both new and old target-files when...
author
Doug Zongker
<dougz@android.com>
Wed, 22 Sep 2010 17:22:14 +0000
(10:22 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 22 Sep 2010 17:22:14 +0000
(10:22 -0700)
Merge commit '
7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c
'
* commit '
7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c
':
accommodate both new and old target-files when creating incrementals (do not merge)
Trivial merge