tree acd1b0ae25d49b8f3493430c41523c2826f34ff4
parent e12e5f376bc9b4cf6a846e850a20d237fc81d503
parent 1147407becd8569ad1ddcf620a10076675ef92da
author Carl Shapiro <cshapiro@google.com> 1295914472 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295914472 -0800

am 1147407b: Merge "Remove unconditional swap from the android atomic operations suite." into honeycomb

* commit '1147407becd8569ad1ddcf620a10076675ef92da':
  Remove unconditional swap from the android atomic operations suite.