OSDN Git Service

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)
commit88eb2a9cf5f2c71bdd73d36ff7dbc29a655cb1ec
tree1a9ee7b217b62eccfccb7510d7ec52c082194a47
parent5848154714fbe84de46af33ee9a57c7588094167
parent3bbd218ef1a70e59662e704c59af6dff1f9d1253
resolved conflicts for merge of 3bbd218e to lmp-mr1-dev-plus-aosp

Change-Id: Ie7f85be196a44ab59554384274f2022239f91b0e
linker/linker.cpp