OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4394aae f32dc71)
Merge "resolved conflicts for merge of a86fcc29 to master"
authorKenny Root <kroot@google.com>
Mon, 9 Apr 2012 22:12:58 +0000 (15:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 9 Apr 2012 22:12:58 +0000 (15:12 -0700)
1  2 
core/Makefile patch | diff1 | diff2 | blob | history

diff --cc core/Makefile
Simple merge
build
About OSDN
Find Software
Develop Software
Help