OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5848154 3bbd218)
resolved conflicts for merge of 3bbd218e to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 16:59:26 +0000 (09:59 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 16:59:26 +0000 (09:59 -0700)
Change-Id: Ie7f85be196a44ab59554384274f2022239f91b0e

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