tree 3292252e9bf25da77984940c654183879a8c9eb0
parent b9d4238383fdd265e06a1996c37a36b0e7b2cc67
parent 8f6c3b4fb3e93db76c3c209d204d8bec918924e0
author David 'Digit' Turner <digit@google.com> 1402698936 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402698936 +0000

am 8f6c3b4f: Merge "Fix CPU architecture check for x86_64."

* commit '8f6c3b4fb3e93db76c3c209d204d8bec918924e0':
  Fix CPU architecture check for x86_64.