tree 1b96a0dc26883c486142e68d8baab4014c9df7a4
parent 20eaebeebea46a09957ece46fa0157a06481790f
parent 7f692fe6448049dca2795d7d648615a2dc7a500c
author Ben Cheng <bccheng@google.com> 1354919824 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354919824 -0800

am 7f692fe6: am 523e21d3: Merge "Fail-proof the inline directives for SMP atomic operations."

* commit '7f692fe6448049dca2795d7d648615a2dc7a500c':
  Fail-proof the inline directives for SMP atomic operations.