tree ca6223c88c6de6ec8d453a2792463d1aa9235c28
parent d2bba662e58cb7f0cda816e10b66aadd7fab5fdc
parent 759a6a05c7c32e9f8a1def0bf463044b89e5ce4e
author Paul Duffin <paulduffin@google.com> 1425057372 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425057372 +0000

am 759a6a05: Merge "Replace usages of Unsafe.compareAndSwap(Int|Long)"

* commit '759a6a05c7c32e9f8a1def0bf463044b89e5ce4e':
  Replace usages of Unsafe.compareAndSwap(Int|Long)