tree e3f9b16a7405c7f71ca70b57a2bd235cb1f74701
parent e06531cb423e22775a3f42fbf5d80282f10c43ed
author Tim Murray <timmurray@google.com> 1398461607 -0700
committer Tim Murray <timmurray@google.com> 1398461607 -0700

Fix build break caused by MCLinker rebase.

Conflicts:
        lib/Script/Android.mk

Change-Id: If03a9d3d75d6a17cbe7ec7a70d6585146c5edbe6