tree a7238bc60ae5304e7a940fd1b8168a6e4d8874f4
parent 681e4896377ddec7d28a9b14982840cb16db4609
parent 97b2a7bae0a8f9164d4b9de2b9e8676463dcb8b3
author Elliott Hughes <enh@google.com> 1416624684 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416624684 +0000

am 97b2a7ba: am d77c1ec9: Merge "Bring our <machine/endian.h> files back in sync."

* commit '97b2a7bae0a8f9164d4b9de2b9e8676463dcb8b3':
  Bring our <machine/endian.h> files back in sync.