tree 7aa13c6b7b2854dc7b6fb3572929fc5dacf6a93b
parent 02e0382b7d277f5d7587a4717619d03e344d52bc
parent 0c5b98362da92d6cfcdffdd6e289ad116be5401b
author Aart Bik <ajcbik@google.com> 1450293984 +0000
committer android-build-merger <android-build-merger@google.com> 1450293984 +0000

Merge "Revert "X86: Use locked add rather than mfence"" am: 1c70f18dce
am: 0c5b98362d

* commit '0c5b98362da92d6cfcdffdd6e289ad116be5401b':
  Revert "X86: Use locked add rather than mfence"