| commit | fbfedc7a7ced75e5f0526729ddecd87ad7ce9b20 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Apr 03 12:40:33 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 03 12:40:33 2013 -0700 |
| tree | ccd3e537aea32517c2b1c416bcfe52be263e9f18 | |
| parent | acec23561e58888050e653024cdd0b2d84860f2a [diff] | |
| parent | 13ab55918a0a114ce1d5c67eeca9c94ce08803ee [diff] |
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