tree 8c6121798d7efda991783418926789f0a421d9fc
parent 91a4aa0f057f882263522fb1c6c04b1413666cea
parent 51e32b52a3d087aec0e80df93129d598221bf312
author Yabin Cui <yabinc@google.com> 1429209884 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429209884 +0000

am 51e32b52: Merge "Move trace.h to stdatomic."

* commit '51e32b52a3d087aec0e80df93129d598221bf312':
  Move trace.h to stdatomic.