tree fc4dd2b11268cac2ba1388ca1df85ad3de50d29c
parent 2a87ef1a90597ff231cf41e22009a048869b55e1
parent 497b94df024cc6b4b6a5e98886dc85e8bc391994
author Andrew Hsieh <andrewhsieh@google.com> 1396429303 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396429303 +0000

am 497b94df: Merge "Headers update from bionic for x86_64 support"

* commit '497b94df024cc6b4b6a5e98886dc85e8bc391994':
  Headers update from bionic for x86_64 support