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:
c921b1e
a6a2969
)
am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp
author
Xavier Ducrohet
<xav@google.com>
Fri, 9 May 2014 02:13:32 +0000
(
02:13
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 9 May 2014 02:13:32 +0000
(
02:13
+0000)
* commit '
a6a2969e020ea16edbe24661d2b63f7f2bdf98b6
':
Remove SDK Tools from platform builds.
1
2
core/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/Makefile
Simple merge