OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9945bac 6c8cafa)
Merge branch 'master' of git://android.git.kernel.org/platform/build into merge_korg_...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 6 Jul 2009 19:27:36 +0000 (12:27 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 6 Jul 2009 19:27:36 +0000 (12:27 -0700)
Conflicts:
core/apicheck_msg_current.txt

1  2 
core/main.mk patch | diff1 | diff2 | blob | history

diff --cc core/main.mk
Simple merge
build
About OSDN
Find Software
Develop Software
Help