tree 2b1869fd170f4ebca27cbc3a23f9c8ea2367359f
parent 611dceecd57ab651514942823cd1eb4a10b8a9fb
parent e6b0c566762dbea1c45198d15ecc5e8a59378d73
author Hans Boehm <hboehm@google.com> 1405193818 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405193818 +0000

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

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