tree 8ed3e43d21a9654c7e3ec14f10ee3b7c6cc83b53
parent 0ae447446b5aca19cd1596657c846a265ab27d5b
parent adce33da293b0eeaaf52673338770f22be71ca5d
author Ian Rogers <irogers@google.com> 1405129330 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405129330 +0000

am adce33da: Merge "Make CAS operations in Object use art::Atomic."

* commit 'adce33da293b0eeaaf52673338770f22be71ca5d':
  Make CAS operations in Object use art::Atomic.