OSDN Git Service

resolved conflicts for f32b689d to mnc-dr-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Tue, 13 Oct 2015 21:59:20 +0000 (14:59 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Tue, 13 Oct 2015 21:59:20 +0000 (14:59 -0700)
commit1002265d0a49a139be9fce7dc14f495527196a4e
treea6da7d5b607717a6e917cf6f8c2cdf1a8ec0af00
parent7197c2909db99ec821fe525a12668679f1caddbf
parentf32b689d3dbe7a1317bce58d1d9bef9bba173c66
resolved conflicts for f32b689d to mnc-dr-dev-plus-aosp

Change-Id: I95f90eb68dcb4b3f4b3d80260b2285c78692b535
linker/linker.cpp