tree 905b05f54a99c30956a1df96a2332d14cd705c84
parent 95b9de9149d78146c99e06d2e7c75b723a2c8899
parent 708a75ba605e9801d704cc3f6d5168a0f849f7a9
author Andrew Hsieh <andrewhsieh@google.com> 1333378685 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333378685 -0700

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

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