tree a942bfae0fc094529115d11c3fbbe48c17813753
parent 11fac779379d3d2571424764a8bd5b3a695582cf
parent ec28a489e8d4fe7ddc35bee1f16e08bebd202dac
author Dan Albert <danalbert@google.com> 1413600127 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413600127 +0000

am ec28a489: am 28c2d3b9: Merge "Fix breakage for x86_64 static executables."

* commit 'ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
  Fix breakage for x86_64 static executables.