tree b0886c639ce984deec51f4820e349f201efe3d6e
parent e39d7b63e40c8664827159d29842ac206a7e478f
parent dc41aa3254cbf443dd08c827e587cf261d1f7b82
author Andrew Hsieh <andrewhsieh@google.com> 1401436613 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401436613 +0000

am dc41aa32: am 5c2c70de: Merge "Add -latomic to all target builds"

* commit 'dc41aa3254cbf443dd08c827e587cf261d1f7b82':
  Add -latomic to all target builds