tree 905b05f54a99c30956a1df96a2332d14cd705c84
parent 0480b898713f17ab9fd89e88637403c51fbca30b
parent ad05e868b8f4a4e57bffcdbf5ffdfff5d3f8c92b
author Andrew Hsieh <andrewhsieh@google.com> 1333378530 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333378530 -0700

am ad05e868: Merge "ndk: Fix <sys/atomics.h> declarations."

* commit 'ad05e868b8f4a4e57bffcdbf5ffdfff5d3f8c92b':
  ndk: Fix <sys/atomics.h> declarations.