tree 0bc25b56188d183e3338b845bd7d9e76f0ed33d3
parent 3e99b0f1d762dd3a7fc4ba93e57b2cc1a59068d3
parent 5fca8b9c9c671d6c01f428c00ca131e65042a9fd
author Andrew Hsieh <andrewhsieh@google.com> 1413455752 +0800
committer Andrew Hsieh <andrewhsieh@google.com> 1413455752 +0800

Merge branch 'master' of https://android.googlesource.com/toolchain/mclinker into aosp

Conflicts:
	m4/llvm.m4

Change-Id: I809c460cb338707818dff205979427af8fcd00ed