tree f9e0bd032f43de056a25bef20a552b923482db5f
parent 350b2b401dc860cef6f2ba363b5f027dd018a988
parent 46ead86b0234fd514c7a1adc306ee37de00d59fb
author Andrew Hsieh <andrewhsieh@google.com> 1333691386 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333691386 -0700

am 46ead86b: Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine"

* commit '46ead86b0234fd514c7a1adc306ee37de00d59fb':
  Refresh development/ndk/platforms/android-9/arch-x86/include/machine