tree ccd3e537aea32517c2b1c416bcfe52be263e9f18
parent acec23561e58888050e653024cdd0b2d84860f2a
parent 13ab55918a0a114ce1d5c67eeca9c94ce08803ee
author Elliott Hughes <enh@google.com> 1365018033 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365018033 -0700

am 13ab5591: am 014c75c7: Merge "Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a"

* commit '13ab55918a0a114ce1d5c67eeca9c94ce08803ee':
  Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a