tree 251c365d3956a4602f3a3ce0ca811f7f2860375e
parent 2ac8207e505ff645c8fe9416da689f12dd73f68e
parent 072877af485d49f11e227c0d22a7bb4a341533d6
author Hans Boehm <hboehm@google.com> 1412388559 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412388559 +0000

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

* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
  Revert "Rewrite atomic.h to use stdatomic.h."