OSDN Git Service

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)
commite4c4311f4402d8f470b91500acf140baa7c4aa47
treeef60d8f1a3cf23bac7a2d02a976ecf0af9b09427
parenta20e37f291957749091ee3a4f30b35a8d4d5a3f3
parentc191a8adee7ff000b6dd71ee336a12118e2a4733
resolved conflicts for merge of c191a8ad to lmp-dev-plus-aosp

Change-Id: I24dcf9701ebe3344796f757a596754cbefbf358a
linker/linker.cpp