tree 27ee4adac9207478417deadc93745f28b96a5126
parent f5204549faf7310cc808bcb3676fb36268178e26
parent 41198eea42b7a6f1d4222abd7a5fec965d11b238
author Hans Boehm <hboehm@google.com> 1412386578 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412386578 +0000

am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""

* commit '41198eea42b7a6f1d4222abd7a5fec965d11b238':
  Revert "Rewrite atomic.h to use stdatomic.h."