OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a20e37f c191a8a)
resolved conflicts for merge of c191a8ad to lmp-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Mon, 1 Sep 2014 21:34:15 +0000 (14:34 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Mon, 1 Sep 2014 21:34:15 +0000 (14:34 -0700)
Change-Id: I24dcf9701ebe3344796f757a596754cbefbf358a

1  2 
linker/linker.cpp patch | diff1 | diff2 | blob | history

diff --cc linker/linker.cpp
Simple merge
bionic
About OSDN
Find Software
Develop Software
Help