tree e55145128872fbbcfac91550791f9c7737210c01
parent 99184bab35c0b88dfc70c8be1d88cfb100dbf4cd
parent 64d7117efc7f7b8b477cd216a119b07041d8f406
author Hans Boehm <hboehm@google.com> 1415924811 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415924811 +0000

am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""

* commit '64d7117efc7f7b8b477cd216a119b07041d8f406':
  Second attempt to "Rewrite atomic.h to use stdatomic.h."