OSDN Git Service

resolve merge conflicts of 38b88a4 to nyc-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Fri, 1 Apr 2016 21:05:42 +0000 (14:05 -0700)
committerElliott Hughes <enh@google.com>
Fri, 1 Apr 2016 21:05:42 +0000 (14:05 -0700)
commitfafbffe331af5a7fcc38c30c9f110690aa91a183
tree16f7bedf5e5e5e889d4557eafe84f4ff2dfc94a9
parenteba9ddb3a6272293127b8f997312575d15b59c8e
parent38b88a4a6475160e64d963f7aa48c882d876737d
resolve merge conflicts of 38b88a4 to nyc-dev-plus-aosp

Change-Id: I5257d0e03723d7a89f7efbe7134ae35a917bfece
linker/linker.cpp