tree b3e459c3203649d21d657d224543d9cc2bbc0ef5
parent 31ffae8c02e85818cf4b7cb88d8d2a6d0685cf14
parent 061ece161d51bf81b8dea9e49b5f6dbb74a2936d
author Ian Rogers <irogers@google.com> 1400715491 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400715491 +0000

am 061ece16: Merge "Begin migration of art::Atomic to std::atomic."

* commit '061ece161d51bf81b8dea9e49b5f6dbb74a2936d':
  Begin migration of art::Atomic to std::atomic.