tree 029e340b406faedb57f5f37cbe4ee41c6512f51c
parent 7fb52e56a67d42291fd3b9e72d18e581ff4ab080
parent 00724b61779e04ff586dad4c9634572712b8ef70
author Elliott Hughes <enh@google.com> 1358870407 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358870407 -0800

am 00724b61: Merge "test_atomics is an ARM specific test"

* commit '00724b61779e04ff586dad4c9634572712b8ef70':
  test_atomics is an ARM specific test