OSDN Git Service

resolved conflicts for merge of 7210c41f to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 17:54:08 +0000 (10:54 -0700)
committerDmitriy Ivanov <dimitry@google.com>
Thu, 2 Oct 2014 17:54:08 +0000 (10:54 -0700)
commit9b6b6e6d4a9fa83c6ded39a618e66c05e21d2989
tree38b6cb6dbe8a03562c091d86065596e4fe5630fa
parent1c69516677e9a7943e90add7f1e44361c7a53b38
parent7210c41fdce065a37f29dce7f32880301cce90c2
resolved conflicts for merge of 7210c41f to lmp-mr1-dev-plus-aosp

Change-Id: I44d84a95f506e89e77cce8c218083a80ca5724b9
linker/linker.cpp