tree b4f7a2aa39141b1d447f9ce2fc3de49b667f6138
parent 06ca5fadbdb2f2f97895a43cf4e866b9f25ea008
parent 4b9f899bf1f5d09622307df85ba7d7f7aabbb834
author Hans Boehm <hboehm@google.com> 1405194068 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405194068 +0000

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

* commit '4b9f899bf1f5d09622307df85ba7d7f7aabbb834':
  Add comment to discourage use of cutils/atomic.h.