am 0de8ac24: am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."

* commit '0de8ac248a8a31c4baa4c1b9ab9dd08d8bdaaecb':
  am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."
This commit is contained in:
Hans Boehm 2014-07-14 17:59:57 +00:00 committed by Android Git Automerger
commit 7d8490eb73

Diff Content Not Available