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:
73f2e19
cc08909
)
reovle conflicts for cc089099
author
shared_user android-merger-prebuild
<android-merger@google.com>
Tue, 18 Jan 2011 16:21:32 +0000
(08:21 -0800)
committer
shared_user android-merger-prebuild
<android-merger@google.com>
Tue, 18 Jan 2011 16:21:32 +0000
(08:21 -0800)
Change-Id: Ia449a3a3dc13928afb5c6ab6f4dcdf6eb049372b
Trivial merge