tree 98f9c11a928ce6e67c611bc6678279676aa9a25e
parent c1bb50e7e6de1e4185d16dcf0d32645fdf7db272
parent 7ceee468756c8ba05fd8b6e82e98856a6d74bf51
author Vladimir Marko <vmarko@google.com> 1385979398 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385979398 -0800

am 7ceee468: Merge "Unsafe.compareAndSwapInt()/Object() intrinsics for x86."

* commit '7ceee468756c8ba05fd8b6e82e98856a6d74bf51':
  Unsafe.compareAndSwapInt()/Object() intrinsics for x86.