tree b05a84218402f55c9a9c3539e59a289fc4f6134a
parent 1418f02306ef4df877da96f9f87c4092c9412ac6
parent ad1267eb72a55ceae0a7e758a251470ed3c64dde
author Stephen Hines <srhines@google.com> 1385589623 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385589623 -0800

am ad1267eb: (-s ours) Merge "DO NOT MERGE - x86_64: Update makefile to avoid early fail of any other project build"

* commit 'ad1267eb72a55ceae0a7e758a251470ed3c64dde':
  DO NOT MERGE - x86_64: Update makefile to avoid early fail of any other project build