tree 7c04860250a3ba2c7c7d277f0eb7c334f317ddf7
parent 71c56f476f353b2ac9199d6a8f3c55baa00058e8
parent e1b5b13b333adf7544811ee033b892927fa44029
author Dimitry Ivanov <dimitry@google.com> 1470086042 +0000
committer android-build-merger <android-build-merger@google.com> 1470086042 +0000

Merge "Sync linker with internal branch" am: a86e11f529
am: e1b5b13b33

Change-Id: Ic9c607e2fad018718e14590cf06a725ef8453712